Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753446AbZK3CyP (ORCPT ); Sun, 29 Nov 2009 21:54:15 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753012AbZK3CyO (ORCPT ); Sun, 29 Nov 2009 21:54:14 -0500 Received: from filer.fsl.cs.sunysb.edu ([130.245.126.2]:33528 "EHLO filer.fsl.cs.sunysb.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752871AbZK3CyN (ORCPT ); Sun, 29 Nov 2009 21:54:13 -0500 Date: Sun, 29 Nov 2009 21:53:30 -0500 Message-Id: <200911300253.nAU2rUFP007609@agora.fsl.cs.sunysb.edu> From: Erez Zadok To: Valerie Aurora Cc: Jan Blunck , Alexander Viro , Christoph Hellwig , Andy Whitcroft , Scott James Remnant , Sandu Popa Marius , Jan Rekorajski , "J. R. Okajima" , Arnd Bergmann , Vladimir Dronnikov , Felix Fietkau , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Jan Blunck , David Woodhouse Subject: Re: [PATCH 09/41] whiteout: Don't return information about whiteouts to userspace In-reply-to: Your message of "Wed, 21 Oct 2009 12:19:07 PDT." <1256152779-10054-10-git-send-email-vaurora@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5413 Lines: 159 In message <1256152779-10054-10-git-send-email-vaurora@redhat.com>, Valerie Aurora writes: > From: Jan Blunck > > The userspace isn't ready for handling another filetype. Therefore this > patch lets readdir() and others skip over the whiteout directory entries > they might find. The NFSD maintainers and MLs should be CC'ed on such patches which touch fs/nfsd/. I'd also suggst you change the subject line of this patch to: whiteout/NFSD: don't return ... This patch seems fairly straightforward: it returns 0 when d_type is DT_WHT. As long as there's no way to create such whiteout entries (not until UM is used), then there's no harm in pushing such patches upstream, no? > Signed-off-by: Jan Blunck > Signed-off-by: David Woodhouse > Signed-off-by: Valerie Aurora > --- > fs/compat.c | 9 +++++++++ > fs/nfsd/nfs3xdr.c | 5 +++++ > fs/nfsd/nfs4xdr.c | 2 +- > fs/nfsd/nfsxdr.c | 4 ++++ > fs/readdir.c | 9 +++++++++ > 5 files changed, 28 insertions(+), 1 deletions(-) > > diff --git a/fs/compat.c b/fs/compat.c > index 6d6f98f..43f6102 100644 > --- a/fs/compat.c > +++ b/fs/compat.c > @@ -847,6 +847,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; > @@ -918,6 +921,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; > @@ -1007,6 +1013,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 01d4ec1..59576d0 100644 > --- a/fs/nfsd/nfs3xdr.c > +++ b/fs/nfsd/nfs3xdr.c > @@ -884,6 +884,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 2dcc7fe..8c25012 100644 > --- a/fs/nfsd/nfs4xdr.c > +++ b/fs/nfsd/nfs4xdr.c > @@ -2263,7 +2263,7 @@ nfsd4_encode_dirent(void *ccdv, const char *name, int namlen, > __be32 nfserr = nfserr_toosmall; > > /* In nfsv4, "." and ".." never make it onto the wire.. */ > - if (name && isdotent(name, namlen)) { > + if (d_type == DT_WHT || (name && isdotent(name, namlen))) { Optimization: I would swap the order of the two conditions separated by the '||': the right-hand-side condition is far more likely to occur than d_type==DT_WHT, so you can enter the body of the 'if' more quickly for the common case. > cd->common.err = nfs_ok; > return 0; > } > diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c > index afd08e2..a7d622c 100644 > --- a/fs/nfsd/nfsxdr.c > +++ b/fs/nfsd/nfsxdr.c > @@ -513,6 +513,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-fsdevel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Erez. -- 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/