From: Valerie Aurora <vaurora@redhat.com> To: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Miklos Szeredi <miklos@szeredi.hu>, Jan Blunck <jblunck@suse.de>, Christoph Hellwig <hch@infradead.org>, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, David Woodhouse <dwmw2@infradead.org>, Valerie Aurora <vaurora@redhat.com>, linux-nfs@vger.kernel.org, "J. Bruce Fields" <bfields@fieldses.org>, Neil Brown <neilb@suse.de> Subject: [PATCH 05/38] whiteout/NFSD: Don't return information about whiteouts to userspace Date: Tue, 15 Jun 2010 11:39:35 -0700 [thread overview] Message-ID: <1276627208-17242-6-git-send-email-vaurora@redhat.com> (raw) In-Reply-To: <1276627208-17242-1-git-send-email-vaurora@redhat.com> From: Jan Blunck <jblunck@suse.de> 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 <jblunck@suse.de> Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Valerie Aurora <vaurora@redhat.com> Cc: linux-nfs@vger.kernel.org Cc: "J. Bruce Fields" <bfields@fieldses.org> Cc: Neil Brown <neilb@suse.de> --- 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 0544873..5d88516 100644 --- a/fs/compat.c +++ b/fs/compat.c @@ -839,6 +839,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; @@ -910,6 +913,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; @@ -999,6 +1005,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 34ccf81..2ddf144 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -2269,6 +2269,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
WARNING: multiple messages have this Message-ID (diff)
From: Valerie Aurora <vaurora-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> To: Alexander Viro <viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org> Cc: Miklos Szeredi <miklos-sUDqSbJrdHQHWmgEVkV9KA@public.gmane.org>, Jan Blunck <jblunck-l3A5Bk7waGM@public.gmane.org>, Christoph Hellwig <hch-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, David Woodhouse <dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>, Valerie Aurora <vaurora-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>, linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, "J. Bruce Fields" <bfields-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>, Neil Brown <neilb-l3A5Bk7waGM@public.gmane.org> Subject: [PATCH 05/38] whiteout/NFSD: Don't return information about whiteouts to userspace Date: Tue, 15 Jun 2010 11:39:35 -0700 [thread overview] Message-ID: <1276627208-17242-6-git-send-email-vaurora@redhat.com> (raw) In-Reply-To: <1276627208-17242-1-git-send-email-vaurora-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> From: Jan Blunck <jblunck-l3A5Bk7waGM@public.gmane.org> 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 <jblunck-l3A5Bk7waGM@public.gmane.org> Signed-off-by: David Woodhouse <dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> Signed-off-by: Valerie Aurora <vaurora-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Cc: linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: "J. Bruce Fields" <bfields-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org> Cc: Neil Brown <neilb-l3A5Bk7waGM@public.gmane.org> --- 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 0544873..5d88516 100644 --- a/fs/compat.c +++ b/fs/compat.c @@ -839,6 +839,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; @@ -910,6 +913,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; @@ -999,6 +1005,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 34ccf81..2ddf144 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -2269,6 +2269,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-nfs" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2010-06-15 18:51 UTC|newest] Thread overview: 114+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-06-15 18:39 [PATCH 00/38] Union mounts - union stack as linked list Valerie Aurora 2010-06-15 18:39 ` [PATCH 01/38] VFS: Comment follow_mount() and friends Valerie Aurora 2010-06-15 18:39 ` [PATCH 02/38] VFS: Make lookup_hash() return a struct path Valerie Aurora 2010-06-15 18:39 ` [PATCH 03/38] VFS: Add read-only users count to superblock Valerie Aurora 2010-06-15 18:39 ` [PATCH 04/38] autofs4: Save autofs trigger's vfsmount in super block info Valerie Aurora 2010-06-16 4:04 ` [autofs] " Ian Kent 2010-06-16 23:14 ` Valerie Aurora 2010-06-17 2:04 ` Ian Kent 2010-06-21 3:39 ` Ian Kent 2010-06-21 13:06 ` Miklos Szeredi 2010-06-21 13:24 ` Ian Kent 2010-06-22 4:46 ` Ian Kent 2010-06-22 5:49 ` J. R. Okajima 2010-06-22 13:11 ` Ian Kent 2010-06-23 1:23 ` Ian Kent 2010-06-23 2:07 ` J. R. Okajima 2010-06-23 2:37 ` Ian Kent 2010-06-24 1:35 ` Ian Kent 2010-06-24 5:16 ` Ian Kent 2010-06-15 18:39 ` Valerie Aurora [this message] 2010-06-15 18:39 ` [PATCH 05/38] whiteout/NFSD: Don't return information about whiteouts to userspace Valerie Aurora 2010-06-15 18:39 ` [PATCH 06/38] whiteout: Add vfs_whiteout() and whiteout inode operation Valerie Aurora 2010-07-13 3:52 ` Ian Kent 2010-07-16 19:50 ` Valerie Aurora 2010-06-15 18:39 ` [PATCH 07/38] whiteout: Set S_OPAQUE inode flag when creating directories Valerie Aurora 2010-07-13 4:05 ` Ian Kent 2010-07-16 20:12 ` Valerie Aurora 2010-07-17 4:14 ` Ian Kent 2010-06-15 18:39 ` [PATCH 08/38] whiteout: Allow removal of a directory with whiteouts Valerie Aurora 2010-06-15 18:39 ` [PATCH 09/38] whiteout: tmpfs whiteout support Valerie Aurora 2010-06-15 18:39 ` Valerie Aurora 2010-06-15 18:39 ` [PATCH 10/38] whiteout: Split of ext2_append_link() from ext2_add_link() Valerie Aurora 2010-06-15 18:39 ` [PATCH 11/38] whiteout: ext2 whiteout support Valerie Aurora 2010-07-13 4:24 ` Ian Kent 2010-07-19 22:14 ` Valerie Aurora 2010-06-15 18:39 ` [PATCH 12/38] whiteout: jffs2 " Valerie Aurora 2010-06-15 18:39 ` Valerie Aurora 2010-06-15 18:39 ` Valerie Aurora 2010-06-15 18:39 ` [PATCH 13/38] fallthru: Basic fallthru definitions Valerie Aurora 2010-06-15 18:39 ` [PATCH 14/38] fallthru: ext2 fallthru support Valerie Aurora 2010-07-13 4:30 ` Ian Kent 2010-08-04 14:44 ` Miklos Szeredi 2010-08-04 22:48 ` Valerie Aurora 2010-08-05 10:36 ` Miklos Szeredi 2010-08-05 23:30 ` Valerie Aurora 2010-08-06 8:15 ` Miklos Szeredi 2010-08-06 17:16 ` Valerie Aurora 2010-08-06 17:44 ` Miklos Szeredi 2010-08-04 23:04 ` Valerie Aurora 2010-08-05 11:13 ` Miklos Szeredi 2010-08-06 17:12 ` Valerie Aurora 2010-08-17 22:27 ` Valerie Aurora 2010-08-18 8:26 ` Miklos Szeredi 2010-06-15 18:39 ` [PATCH 15/38] fallthru: jffs2 " Valerie Aurora 2010-06-15 18:39 ` Valerie Aurora 2010-06-15 18:39 ` Valerie Aurora 2010-06-15 18:39 ` [PATCH 16/38] fallthru: tmpfs " Valerie Aurora 2010-06-15 18:39 ` [PATCH 17/38] union-mount: Union mounts documentation Valerie Aurora 2010-06-17 8:01 ` Alex Riesen 2010-06-17 18:39 ` Valerie Aurora 2010-06-17 20:32 ` Alex Riesen 2010-06-18 21:06 ` Valerie Aurora 2010-06-21 13:14 ` Miklos Szeredi 2010-06-21 23:17 ` Valerie Aurora 2010-06-23 8:43 ` Alex Riesen 2010-06-23 8:43 ` Alex Riesen 2010-06-15 18:39 ` [PATCH 18/38] union-mount: Introduce MNT_UNION and MS_UNION flags Valerie Aurora 2010-06-15 18:39 ` [PATCH 19/38] union-mount: Introduce union_dir structure and basic operations Valerie Aurora 2010-07-13 4:39 ` Ian Kent 2010-07-16 20:51 ` Valerie Aurora 2010-08-04 14:51 ` Miklos Szeredi 2010-08-04 19:47 ` Valerie Aurora 2010-08-05 10:28 ` Miklos Szeredi 2010-08-06 17:09 ` Valerie Aurora 2010-06-15 18:39 ` [PATCH 20/38] union-mount: Free union dirs on removal from dcache Valerie Aurora 2010-06-15 18:39 ` [PATCH 21/38] union-mount: Support for mounting union mount file systems Valerie Aurora 2010-07-13 4:47 ` Ian Kent 2010-07-16 21:02 ` Valerie Aurora 2010-07-20 3:12 ` Ian Kent 2010-08-04 21:59 ` Valerie Aurora 2010-08-05 10:34 ` Miklos Szeredi 2010-08-06 16:33 ` Valerie Aurora 2010-07-16 21:05 ` Valerie Aurora 2010-08-04 14:55 ` Miklos Szeredi 2010-08-04 19:50 ` Valerie Aurora 2010-08-05 4:26 ` Valerie Aurora 2010-06-15 18:39 ` [PATCH 22/38] union-mount: Implement union lookup Valerie Aurora 2010-07-13 4:49 ` Ian Kent 2010-07-19 21:58 ` Valerie Aurora 2010-06-15 18:39 ` [PATCH 23/38] union-mount: Call do_whiteout() on unlink and rmdir in unions Valerie Aurora 2010-06-15 18:39 ` [PATCH 24/38] union-mount: Copy up directory entries on first readdir() Valerie Aurora 2010-07-13 4:51 ` Ian Kent 2010-06-15 18:39 ` [PATCH 25/38] VFS: Split inode_permission() and create path_permission() Valerie Aurora 2010-06-15 18:39 ` [PATCH 26/38] VFS: Create user_path_nd() to lookup both parent and target Valerie Aurora 2010-06-15 18:39 ` [PATCH 27/38] union-mount: In-kernel file copyup routines Valerie Aurora 2010-07-13 4:56 ` Ian Kent 2010-07-19 22:41 ` Valerie Aurora 2010-08-04 15:26 ` Miklos Szeredi 2010-08-05 19:54 ` Valerie Aurora 2010-06-15 18:39 ` [PATCH 28/38] union-mount: Implement union-aware access()/faccessat() Valerie Aurora 2010-06-15 18:39 ` [PATCH 29/38] union-mount: Implement union-aware link() Valerie Aurora 2010-06-15 18:40 ` [PATCH 30/38] union-mount: Implement union-aware rename() Valerie Aurora 2010-06-15 18:40 ` [PATCH 31/38] union-mount: Implement union-aware writable open() Valerie Aurora 2010-06-15 18:40 ` [PATCH 32/38] union-mount: Implement union-aware chown() Valerie Aurora 2010-06-15 18:40 ` [PATCH 33/38] union-mount: Implement union-aware truncate() Valerie Aurora 2010-06-15 18:40 ` [PATCH 34/38] union-mount: Implement union-aware chmod()/fchmodat() Valerie Aurora 2010-06-15 18:40 ` [PATCH 35/38] union-mount: Implement union-aware lchown() Valerie Aurora 2010-06-15 18:40 ` [PATCH 36/38] union-mount: Implement union-aware utimensat() Valerie Aurora 2010-06-15 18:40 ` [PATCH 37/38] union-mount: Implement union-aware setxattr() Valerie Aurora 2010-06-15 18:40 ` [PATCH 38/38] union-mount: Implement union-aware lsetxattr() Valerie Aurora 2010-06-25 19:04 [PATCH 00/38] Union mounts - multiple layers and submounts Valerie Aurora 2010-06-25 19:04 ` [PATCH 05/38] whiteout/NFSD: Don't return information about whiteouts to userspace Valerie Aurora 2010-08-06 22:34 [PATCH 00/38] VFS union mounts - Add MS_FALLTHRU Valerie Aurora 2010-08-06 22:34 ` [PATCH 05/38] whiteout/NFSD: Don't return information about whiteouts to userspace Valerie Aurora 2010-08-06 23:36 ` J. Bruce Fields 2010-08-06 23:36 ` J. Bruce Fields
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1276627208-17242-6-git-send-email-vaurora@redhat.com \ --to=vaurora@redhat.com \ --cc=bfields@fieldses.org \ --cc=dwmw2@infradead.org \ --cc=hch@infradead.org \ --cc=jblunck@suse.de \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nfs@vger.kernel.org \ --cc=miklos@szeredi.hu \ --cc=neilb@suse.de \ --cc=viro@zeniv.linux.org.uk \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.