Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754488Ab0DSMho (ORCPT ); Mon, 19 Apr 2010 08:37:44 -0400 Received: from cantor.suse.de ([195.135.220.2]:60777 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754146Ab0DSMhm (ORCPT ); Mon, 19 Apr 2010 08:37:42 -0400 Date: Mon, 19 Apr 2010 14:37:41 +0200 From: Jan Blunck To: "J. Bruce Fields" Cc: Valerie Aurora , Alexander Viro , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, David Woodhouse , linux-nfs@vger.kernel.org, Neil Brown Subject: Re: [PATCH 04/35] whiteout/NFSD: Don't return information about whiteouts to userspace Message-ID: <20100419123741.GF10776@bolzano.suse.de> References: <1271372682-21225-1-git-send-email-vaurora@redhat.com> <1271372682-21225-2-git-send-email-vaurora@redhat.com> <1271372682-21225-3-git-send-email-vaurora@redhat.com> <1271372682-21225-4-git-send-email-vaurora@redhat.com> <1271372682-21225-5-git-send-email-vaurora@redhat.com> <20100416155943.GD29363@fieldses.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100416155943.GD29363@fieldses.org> Organization: SUSE LINUX Products GmbH, GF Markus Rex, HRB 16746 (AG Nuernberg) User-Agent: Mutt/1.5.9i Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5278 Lines: 161 On Fri, Apr 16, J. Bruce Fields wrote: > Seems OK. (Though is there any way we could avoid having to add the > check to every filldir callback? Isn't the default going to be > disinterest in whiteouts? How are we avoiding all the same checks in > the case of lookup?) > Bruce, the alternative would be to include the check in the fs readdir() implementation, and therefore prevent the call of the filler. I think this patch would be even bigger. Jan > --b. > > On Thu, Apr 15, 2010 at 04:04:11PM -0700, Valerie Aurora wrote: > > From: Jan Blunck > > > > Userspace isn't ready for handling another file type, so silently drop > > whiteout directory entries before they leave the kernel. > > > > Signed-off-by: Jan Blunck > > Signed-off-by: David Woodhouse > > Signed-off-by: Valerie Aurora > > Cc: linux-nfs@vger.kernel.org > > Cc: "J. Bruce Fields" > > Cc: Neil Brown > > --- > > fs/compat.c | 9 +++++++++ > > fs/nfsd/nfs3xdr.c | 5 +++++ > > fs/nfsd/nfs4xdr.c | 5 +++++ > > fs/nfsd/nfsxdr.c | 4 ++++ > > fs/readdir.c | 9 +++++++++ > > 5 files changed, 32 insertions(+), 0 deletions(-) > > > > diff --git a/fs/compat.c b/fs/compat.c > > index 00d90c2..624e1a5 100644 > > --- a/fs/compat.c > > +++ b/fs/compat.c > > @@ -838,6 +838,9 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen, > > struct compat_old_linux_dirent __user *dirent; > > compat_ulong_t d_ino; > > > > + if (d_type == DT_WHT) > > + return 0; > > + > > if (buf->result) > > return -EINVAL; > > d_ino = ino; > > @@ -909,6 +912,9 @@ static int compat_filldir(void *__buf, const char *name, int namlen, > > compat_ulong_t d_ino; > > int reclen = ALIGN(NAME_OFFSET(dirent) + namlen + 2, sizeof(compat_long_t)); > > > > + if (d_type == DT_WHT) > > + return 0; > > + > > buf->error = -EINVAL; /* only used if we fail.. */ > > if (reclen > buf->count) > > return -EINVAL; > > @@ -998,6 +1004,9 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t > > int reclen = ALIGN(jj + namlen + 1, sizeof(u64)); > > u64 off; > > > > + if (d_type == DT_WHT) > > + return 0; > > + > > buf->error = -EINVAL; /* only used if we fail.. */ > > if (reclen > buf->count) > > return -EINVAL; > > diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c > > index 2a533a0..9b96f5a 100644 > > --- a/fs/nfsd/nfs3xdr.c > > +++ b/fs/nfsd/nfs3xdr.c > > @@ -885,6 +885,11 @@ encode_entry(struct readdir_cd *ccd, const char *name, int namlen, > > int elen; /* estimated entry length in words */ > > int num_entry_words = 0; /* actual number of words */ > > > > + if (d_type == DT_WHT) { > > + cd->common.err = nfs_ok; > > + return 0; > > + } > > + > > if (cd->offset) { > > u64 offset64 = offset; > > > > diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c > > index 78c7e24..8839ba8 100644 > > --- a/fs/nfsd/nfs4xdr.c > > +++ b/fs/nfsd/nfs4xdr.c > > @@ -2268,6 +2268,11 @@ nfsd4_encode_dirent(void *ccdv, const char *name, int namlen, > > return 0; > > } > > > > + if (d_type == DT_WHT) { > > + cd->common.err = nfs_ok; > > + return 0; > > + } > > + > > if (cd->offset) > > xdr_encode_hyper(cd->offset, (u64) offset); > > > > diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c > > index 4ce005d..0e57d4b 100644 > > --- a/fs/nfsd/nfsxdr.c > > +++ b/fs/nfsd/nfsxdr.c > > @@ -503,6 +503,10 @@ nfssvc_encode_entry(void *ccdv, const char *name, > > namlen, name, offset, ino); > > */ > > > > + if (d_type == DT_WHT) { > > + cd->common.err = nfs_ok; > > + return 0; > > + } > > if (offset > ~((u32) 0)) { > > cd->common.err = nfserr_fbig; > > return -EINVAL; > > diff --git a/fs/readdir.c b/fs/readdir.c > > index 7723401..3a48491 100644 > > --- a/fs/readdir.c > > +++ b/fs/readdir.c > > @@ -77,6 +77,9 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset > > struct old_linux_dirent __user * dirent; > > unsigned long d_ino; > > > > + if (d_type == DT_WHT) > > + return 0; > > + > > if (buf->result) > > return -EINVAL; > > d_ino = ino; > > @@ -154,6 +157,9 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset, > > unsigned long d_ino; > > int reclen = ALIGN(NAME_OFFSET(dirent) + namlen + 2, sizeof(long)); > > > > + if (d_type == DT_WHT) > > + return 0; > > + > > buf->error = -EINVAL; /* only used if we fail.. */ > > if (reclen > buf->count) > > return -EINVAL; > > @@ -239,6 +245,9 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset, > > struct getdents_callback64 * buf = (struct getdents_callback64 *) __buf; > > int reclen = ALIGN(NAME_OFFSET(dirent) + namlen + 1, sizeof(u64)); > > > > + if (d_type == DT_WHT) > > + return 0; > > + > > buf->error = -EINVAL; /* only used if we fail.. */ > > if (reclen > buf->count) > > return -EINVAL; > > -- > > 1.6.3.3 > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/