Attachment 299505 Details for Bug 439431 – patch -- add support for rdattr_error in NFSv4 readdir

[patch] patch -- add support for rdattr_error in NFSv4 readdir

0001-BZ-227610-NFSv4-add-support-for-rdattr_error-in-NF.patch (text/plain), 2.45 KB, created by Jeff Layton on 2008-03-28 17:50:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2008-03-28 17:50:25 UTC

Size: 2.45 KB

patch

obsolete

>From 96d36c8220b2f5402d8ab69ff86f56970be1bbbd Mon Sep 17 00:00:00 2001
>From: Jeff Layton <jlayton@redhat.com>
>Date: Tue, 4 Mar 2008 13:33:47 -0500
>Subject: [PATCH] BZ#227610: NFSv4: add support for rdattr_error in NFSv4 readdir requests.
>
>Request RDATTR_ERROR as an attribute in readdir to distinguish between a
>directory being within an absent filesystem or one (or more) of its entries.
>
>Signed-off-by: Manoj Naik <manoj@almaden.ibm.com>
>Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
>Backported-by: Jeff Layton <jlayton@redhat.com>
>---
> fs/nfs/nfs4xdr.c |   24 +++++++++++++++++-------
> 1 files changed, 17 insertions(+), 7 deletions(-)
>
>diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
>index 3f01e6c..52cde02 100644
>--- a/fs/nfs/nfs4xdr.c
>+++ b/fs/nfs/nfs4xdr.c
>@@ -1008,6 +1008,10 @@ static int encode_read(struct xdr_stream *xdr, const struct nfs_readargs *args)
> static int encode_readdir(struct xdr_stream *xdr, const struct nfs4_readdir_arg *readdir, struct rpc_rqst *req)
> {
> 	struct rpc_auth *auth = req->rq_task->tk_auth;
>+	uint32_t attrs[2] = {
>+		FATTR4_WORD0_RDATTR_ERROR|FATTR4_WORD0_FILEID,
>+		FATTR4_WORD1_MOUNTED_ON_FILEID,
>+	};
> 	int replen;
> 	uint32_t *p;
> 
>@@ -1018,13 +1022,13 @@ static int encode_readdir(struct xdr_stream *xdr, const struct nfs4_readdir_arg
> 	WRITE32(readdir->count >> 1);  /* We're not doing readdirplus */
> 	WRITE32(readdir->count);
> 	WRITE32(2);
>-	if (readdir->bitmask[1] & FATTR4_WORD1_MOUNTED_ON_FILEID) {
>-		WRITE32(0);
>-		WRITE32(FATTR4_WORD1_MOUNTED_ON_FILEID);
>-	} else {
>-		WRITE32(FATTR4_WORD0_FILEID);
>-		WRITE32(0);
>-	}
>+	/* Switch to mounted_on_fileid if the server supports it */
>+	if (readdir->bitmask[1] & FATTR4_WORD1_MOUNTED_ON_FILEID)
>+		attrs[0] &= ~FATTR4_WORD0_FILEID;
>+	else
>+		attrs[1] &= ~FATTR4_WORD1_MOUNTED_ON_FILEID;
>+	WRITE32(attrs[0] & readdir->bitmask[0]);
>+	WRITE32(attrs[1] & readdir->bitmask[1]);
> 
> 	/* set up reply kvec
> 	 *    toplevel_status + taglen + rescount + OP_PUTFH + status
>@@ -3939,6 +3943,12 @@ uint32_t *nfs4_decode_dirent(uint32_t *p, struct nfs_entry *entry, int plus)
> 	}
> 	len = XDR_QUADLEN(ntohl(*p++));	/* attribute buffer length */
> 	if (len > 0) {
>+		if (bitmap[0] & FATTR4_WORD0_RDATTR_ERROR) {
>+			bitmap[0] &= ~FATTR4_WORD0_RDATTR_ERROR;
>+			/* Ignore the return value of rdattr_error for now */
>+			p++;
>+			len--;
>+		}
> 		if (bitmap[0] == 0 && bitmap[1] == FATTR4_WORD1_MOUNTED_ON_FILEID)
> 			xdr_decode_hyper(p, &entry->ino);
> 		else if (bitmap[0] == FATTR4_WORD0_FILEID)
>-- 
>1.5.3.6
>

Actions: View | Diff

Attachments on bug 439431: 299505