Merge branch 'for-rafael' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx...

[karo-tx-linux.git] / fs / nfsd / nfs4xdr.c

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 75e0563c09d1911d927501ee52b53a3bd988940e..51c9e9ca39a4d7c5e0537a2cafed4ec9caeb789d 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -2140,6 +2140,27 @@ nfsd4_encode_aclname(struct xdr_stream *xdr, struct svc_rqst *rqstp,
                return nfsd4_encode_user(xdr, rqstp, ace->who_uid);
 }
 
+static inline __be32
+nfsd4_encode_layout_type(struct xdr_stream *xdr, enum pnfs_layouttype layout_type)
+{
+       __be32 *p;
+
+       if (layout_type) {
+               p = xdr_reserve_space(xdr, 8);
+               if (!p)
+                       return nfserr_resource;
+               *p++ = cpu_to_be32(1);
+               *p++ = cpu_to_be32(layout_type);
+       } else {
+               p = xdr_reserve_space(xdr, 4);
+               if (!p)
+                       return nfserr_resource;
+               *p++ = cpu_to_be32(0);
+       }
+
+       return 0;
+}
+
 #define WORD0_ABSENT_FS_ATTRS (FATTR4_WORD0_FS_LOCATIONS | FATTR4_WORD0_FSID | \
                              FATTR4_WORD0_RDATTR_ERROR)
 #define WORD1_ABSENT_FS_ATTRS FATTR4_WORD1_MOUNTED_ON_FILEID
@@ -2205,6 +2226,39 @@ static int get_parent_attributes(struct svc_export *exp, struct kstat *stat)
        return err;
 }
 
+static __be32
+nfsd4_encode_bitmap(struct xdr_stream *xdr, u32 bmval0, u32 bmval1, u32 bmval2)
+{
+       __be32 *p;
+
+       if (bmval2) {
+               p = xdr_reserve_space(xdr, 16);
+               if (!p)
+                       goto out_resource;
+               *p++ = cpu_to_be32(3);
+               *p++ = cpu_to_be32(bmval0);
+               *p++ = cpu_to_be32(bmval1);
+               *p++ = cpu_to_be32(bmval2);
+       } else if (bmval1) {
+               p = xdr_reserve_space(xdr, 12);
+               if (!p)
+                       goto out_resource;
+               *p++ = cpu_to_be32(2);
+               *p++ = cpu_to_be32(bmval0);
+               *p++ = cpu_to_be32(bmval1);
+       } else {
+               p = xdr_reserve_space(xdr, 8);
+               if (!p)
+                       goto out_resource;
+               *p++ = cpu_to_be32(1);
+               *p++ = cpu_to_be32(bmval0);
+       }
+
+       return 0;
+out_resource:
+       return nfserr_resource;
+}
+
 /*
  * Note: @fhp can be NULL; in this case, we might have to compose the filehandle
  * ourselves.
@@ -2301,28 +2355,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
        }
 #endif /* CONFIG_NFSD_V4_SECURITY_LABEL */
 
-       if (bmval2) {
-               p = xdr_reserve_space(xdr, 16);
-               if (!p)
-                       goto out_resource;
-               *p++ = cpu_to_be32(3);
-               *p++ = cpu_to_be32(bmval0);
-               *p++ = cpu_to_be32(bmval1);
-               *p++ = cpu_to_be32(bmval2);
-       } else if (bmval1) {
-               p = xdr_reserve_space(xdr, 12);
-               if (!p)
-                       goto out_resource;
-               *p++ = cpu_to_be32(2);
-               *p++ = cpu_to_be32(bmval0);
-               *p++ = cpu_to_be32(bmval1);
-       } else {
-               p = xdr_reserve_space(xdr, 8);
-               if (!p)
-                       goto out_resource;
-               *p++ = cpu_to_be32(1);
-               *p++ = cpu_to_be32(bmval0);
-       }
+       status = nfsd4_encode_bitmap(xdr, bmval0, bmval1, bmval2);
+       if (status)
+               goto out;
 
        attrlen_offset = xdr->buf->len;
        p = xdr_reserve_space(xdr, 4);
@@ -2675,6 +2710,9 @@ out_acl:
                *p++ = cpu_to_be32(stat.mtime.tv_nsec);
        }
        if (bmval1 & FATTR4_WORD1_MOUNTED_ON_FILEID) {
+               struct kstat parent_stat;
+               u64 ino = stat.ino;
+
                p = xdr_reserve_space(xdr, 8);
                if (!p)
                        goto out_resource;
@@ -2683,25 +2721,25 @@ out_acl:
                 * and this is the root of a cross-mounted filesystem.
                 */
                if (ignore_crossmnt == 0 &&
-                   dentry == exp->ex_path.mnt->mnt_root)
-                       get_parent_attributes(exp, &stat);
-               p = xdr_encode_hyper(p, stat.ino);
+                   dentry == exp->ex_path.mnt->mnt_root) {
+                       err = get_parent_attributes(exp, &parent_stat);
+                       if (err)
+                               goto out_nfserr;
+                       ino = parent_stat.ino;
+               }
+               p = xdr_encode_hyper(p, ino);
        }
 #ifdef CONFIG_NFSD_PNFS
-       if ((bmval1 & FATTR4_WORD1_FS_LAYOUT_TYPES) ||
-           (bmval2 & FATTR4_WORD2_LAYOUT_TYPES)) {
-               if (exp->ex_layout_type) {
-                       p = xdr_reserve_space(xdr, 8);
-                       if (!p)
-                               goto out_resource;
-                       *p++ = cpu_to_be32(1);
-                       *p++ = cpu_to_be32(exp->ex_layout_type);
-               } else {
-                       p = xdr_reserve_space(xdr, 4);
-                       if (!p)
-                               goto out_resource;
-                       *p++ = cpu_to_be32(0);
-               }
+       if (bmval1 & FATTR4_WORD1_FS_LAYOUT_TYPES) {
+               status = nfsd4_encode_layout_type(xdr, exp->ex_layout_type);
+               if (status)
+                       goto out;
+       }
+
+       if (bmval2 & FATTR4_WORD2_LAYOUT_TYPES) {
+               status = nfsd4_encode_layout_type(xdr, exp->ex_layout_type);
+               if (status)
+                       goto out;
        }
 
        if (bmval2 & FATTR4_WORD2_LAYOUT_BLKSIZE) {
@@ -2711,21 +2749,20 @@ out_acl:
                *p++ = cpu_to_be32(stat.blksize);
        }
 #endif /* CONFIG_NFSD_PNFS */
+       if (bmval2 & FATTR4_WORD2_SUPPATTR_EXCLCREAT) {
+               status = nfsd4_encode_bitmap(xdr, NFSD_SUPPATTR_EXCLCREAT_WORD0,
+                                                 NFSD_SUPPATTR_EXCLCREAT_WORD1,
+                                                 NFSD_SUPPATTR_EXCLCREAT_WORD2);
+               if (status)
+                       goto out;
+       }
+
        if (bmval2 & FATTR4_WORD2_SECURITY_LABEL) {
                status = nfsd4_encode_security_label(xdr, rqstp, context,
                                                                contextlen);
                if (status)
                        goto out;
        }
-       if (bmval2 & FATTR4_WORD2_SUPPATTR_EXCLCREAT) {
-               p = xdr_reserve_space(xdr, 16);
-               if (!p)
-                       goto out_resource;
-               *p++ = cpu_to_be32(3);
-               *p++ = cpu_to_be32(NFSD_SUPPATTR_EXCLCREAT_WORD0);
-               *p++ = cpu_to_be32(NFSD_SUPPATTR_EXCLCREAT_WORD1);
-               *p++ = cpu_to_be32(NFSD_SUPPATTR_EXCLCREAT_WORD2);
-       }
 
        attrlen = htonl(xdr->buf->len - attrlen_offset - 4);
        write_bytes_to_xdr_buf(xdr->buf, attrlen_offset, &attrlen, 4);
@@ -3044,13 +3081,12 @@ nfsd4_encode_create(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_
        __be32 *p;
 
        if (!nfserr) {
-               p = xdr_reserve_space(xdr, 32);
+               p = xdr_reserve_space(xdr, 20);
                if (!p)
                        return nfserr_resource;
-               p = encode_cinfo(p, &create->cr_cinfo);
-               *p++ = cpu_to_be32(2);
-               *p++ = cpu_to_be32(create->cr_bmval[0]);
-               *p++ = cpu_to_be32(create->cr_bmval[1]);
+               encode_cinfo(p, &create->cr_cinfo);
+               nfserr = nfsd4_encode_bitmap(xdr, create->cr_bmval[0],
+                               create->cr_bmval[1], create->cr_bmval[2]);
        }
        return nfserr;
 }
@@ -3190,16 +3226,22 @@ nfsd4_encode_open(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_op
        nfserr = nfsd4_encode_stateid(xdr, &open->op_stateid);
        if (nfserr)
                goto out;
-       p = xdr_reserve_space(xdr, 40);
+       p = xdr_reserve_space(xdr, 24);
        if (!p)
                return nfserr_resource;
        p = encode_cinfo(p, &open->op_cinfo);
        *p++ = cpu_to_be32(open->op_rflags);
-       *p++ = cpu_to_be32(2);
-       *p++ = cpu_to_be32(open->op_bmval[0]);
-       *p++ = cpu_to_be32(open->op_bmval[1]);
-       *p++ = cpu_to_be32(open->op_delegate_type);
 
+       nfserr = nfsd4_encode_bitmap(xdr, open->op_bmval[0], open->op_bmval[1],
+                                       open->op_bmval[2]);
+       if (nfserr)
+               goto out;
+
+       p = xdr_reserve_space(xdr, 4);
+       if (!p)
+               return nfserr_resource;
+
+       *p++ = cpu_to_be32(open->op_delegate_type);
        switch (open->op_delegate_type) {
        case NFS4_OPEN_DELEGATE_NONE:
                break;