git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
fs
/
nfsd
/
nfs4xdr.c
diff --git
a/fs/nfsd/nfs4xdr.c
b/fs/nfsd/nfs4xdr.c
index
e95b02a
..
2016b9c
100644
(file)
--- a/
fs/nfsd/nfs4xdr.c
+++ b/
fs/nfsd/nfs4xdr.c
@@
-55,7
+55,6
@@
#include <linux/nfsd/state.h>
#include <linux/nfsd/xdr4.h>
#include <linux/nfsd_idmap.h>
#include <linux/nfsd/state.h>
#include <linux/nfsd/xdr4.h>
#include <linux/nfsd_idmap.h>
-#include <linux/vserver/xid.h>
#define NFSDDBG_FACILITY NFSDDBG_XDR
#define NFSDDBG_FACILITY NFSDDBG_XDR
@@
-1561,18
+1560,14
@@
nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
WRITE32(stat.nlink);
}
if (bmval1 & FATTR4_WORD1_OWNER) {
WRITE32(stat.nlink);
}
if (bmval1 & FATTR4_WORD1_OWNER) {
- status = nfsd4_encode_user(rqstp,
- XIDINO_UID(XID_TAG(dentry->d_inode),
- stat.uid, stat.xid), &p, &buflen);
+ status = nfsd4_encode_user(rqstp, stat.uid, &p, &buflen);
if (status == nfserr_resource)
goto out_resource;
if (status)
goto out;
}
if (bmval1 & FATTR4_WORD1_OWNER_GROUP) {
if (status == nfserr_resource)
goto out_resource;
if (status)
goto out;
}
if (bmval1 & FATTR4_WORD1_OWNER_GROUP) {
- status = nfsd4_encode_group(rqstp,
- XIDINO_GID(XID_TAG(dentry->d_inode),
- stat.gid, stat.xid), &p, &buflen);
+ status = nfsd4_encode_group(rqstp, stat.gid, &p, &buflen);
if (status == nfserr_resource)
goto out_resource;
if (status)
if (status == nfserr_resource)
goto out_resource;
if (status)
@@
-2524,7
+2519,7
@@
nfs4svc_encode_compoundres(struct svc_rqst *rqstp, u32 *p, struct nfsd4_compound
/*
* All that remains is to write the tag and operation count...
*/
/*
* All that remains is to write the tag and operation count...
*/
- struct
k
vec *iov;
+ struct
io
vec *iov;
p = resp->tagp;
*p++ = htonl(resp->taglen);
memcpy(p, resp->tag, resp->taglen);
p = resp->tagp;
*p++ = htonl(resp->taglen);
memcpy(p, resp->tag, resp->taglen);