From: NeilBrown <neilb@cse.unsw.edu.au>
Move code to encode the special rdattr_error attribute to
nfsd4_encode_rdattr_error().
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/fs/nfsd/nfs4xdr.c | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff -puN fs/nfsd/nfs4xdr.c~knfsd-nfsd4-encode_dirent-move-rdattr_error-code-to-new-function fs/nfsd/nfs4xdr.c
--- 25/fs/nfsd/nfs4xdr.c~knfsd-nfsd4-encode_dirent-move-rdattr_error-code-to-new-function 2004-11-15 22:07:26.771519112 -0800
+++ 25-akpm/fs/nfsd/nfs4xdr.c 2004-11-15 22:07:26.777518200 -0800
@@ -1806,6 +1806,23 @@ out_put:
return nfserr;
}
+static u32 *
+nfsd4_encode_rdattr_error(u32 *p, int buflen, int nfserr)
+{
+ u32 *attrlenp;
+
+ if (buflen < 6)
+ return NULL;
+ *p++ = htonl(2);
+ *p++ = htonl(FATTR4_WORD0_RDATTR_ERROR); /* bmval0 */
+ *p++ = htonl(0); /* bmval1 */
+
+ attrlenp = p++;
+ *p++ = nfserr; /* no htonl */
+ *attrlenp = htonl((char *)p - (char *)attrlenp - 4);
+ return p;
+}
+
static int
nfsd4_encode_dirent(struct readdir_cd *ccd, const char *name, int namlen,
loff_t offset, ino_t ino, unsigned int d_type)
@@ -1813,7 +1830,6 @@ nfsd4_encode_dirent(struct readdir_cd *c
struct nfsd4_readdir *cd = container_of(ccd, struct nfsd4_readdir, common);
int buflen;
u32 *p = cd->buffer;
- u32 *attrlenp;
int nfserr = 0;
/* In nfsv4, "." and ".." never make it onto the wire.. */
@@ -1858,16 +1874,9 @@ nfsd4_encode_dirent(struct readdir_cd *c
cd->common.err = nfserr;
return -EINVAL;
}
-
- if (buflen < 6)
- goto nospc;
- *p++ = htonl(2);
- *p++ = htonl(FATTR4_WORD0_RDATTR_ERROR); /* bmval0 */
- *p++ = htonl(0); /* bmval1 */
-
- attrlenp = p++;
- *p++ = nfserr; /* no htonl */
- *attrlenp = htonl((char *)p - (char *)attrlenp - 4);
+ p = nfsd4_encode_rdattr_error(p, buflen, nfserr);
+ if (p == NULL)
+ goto out_nospc;
out:
cd->buflen -= (p - cd->buffer);
_