Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[cascardo/linux.git] / fs / nfsd / nfsxdr.c

diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index b17d932..1ac306b 100644 (file)
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -152,7 +152,7 @@ encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp,
        type = (stat->mode & S_IFMT);
 
        *p++ = htonl(nfs_ftypes[type >> 12]);
-       *p++ = htonl((u32) (stat->mode & S_IALLUGO));
+       *p++ = htonl((u32) stat->mode);
        *p++ = htonl((u32) stat->nlink);
        *p++ = htonl((u32) from_kuid(&init_user_ns, stat->uid));
        *p++ = htonl((u32) from_kgid(&init_user_ns, stat->gid));
@@ -214,7 +214,8 @@ nfssvc_decode_void(struct svc_rqst *rqstp, __be32 *p, void *dummy)
 int
 nfssvc_decode_fhandle(struct svc_rqst *rqstp, __be32 *p, struct nfsd_fhandle *args)
 {
-       if (!(p = decode_fh(p, &args->fh)))
+       p = decode_fh(p, &args->fh);
+       if (!p)
                return 0;
        return xdr_argsize_check(rqstp, p);
 }
@@ -248,7 +249,8 @@ nfssvc_decode_readargs(struct svc_rqst *rqstp, __be32 *p,
 {
        unsigned int len;
        int v;
-       if (!(p = decode_fh(p, &args->fh)))
+       p = decode_fh(p, &args->fh);
+       if (!p)
                return 0;
 
        args->offset    = ntohl(*p++);
@@ -281,7 +283,8 @@ nfssvc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p,
        unsigned int len, hdr, dlen;
        int v;
 
-       if (!(p = decode_fh(p, &args->fh)))
+       p = decode_fh(p, &args->fh);
+       if (!p)
                return 0;
 
        p++;                            /* beginoffset */
@@ -355,7 +358,8 @@ nfssvc_decode_renameargs(struct svc_rqst *rqstp, __be32 *p,
 int
 nfssvc_decode_readlinkargs(struct svc_rqst *rqstp, __be32 *p, struct nfsd_readlinkargs *args)
 {
-       if (!(p = decode_fh(p, &args->fh)))
+       p = decode_fh(p, &args->fh);
+       if (!p)
                return 0;
        args->buffer = page_address(*(rqstp->rq_next_page++));
 
@@ -391,7 +395,8 @@ int
 nfssvc_decode_readdirargs(struct svc_rqst *rqstp, __be32 *p,
                                        struct nfsd_readdirargs *args)
 {
-       if (!(p = decode_fh(p, &args->fh)))
+       p = decode_fh(p, &args->fh);
+       if (!p)
                return 0;
        args->cookie = ntohl(*p++);
        args->count  = ntohl(*p++);