From: Valerie Aurora <valerie.aurora@gmail.com>
To: linux-fsdevel@vger.kernel.org, linux@vger.kernel.org
Cc: viro@zeniv.linux.org.uk, Valerie Aurora <vaurora@redhat.com>,
Valerie Aurora <valerie.aurora@gmail.com>
Subject: [PATCH 53/74] union-mount: Create whiteout on unlink()
Date: Tue, 22 Mar 2011 19:04:44 -0700 [thread overview]
Message-ID: <1300845905-14433-10-git-send-email-valerie.aurora@gmail.com> (raw)
In-Reply-To: <1300845905-14433-1-git-send-email-valerie.aurora@gmail.com>
From: Valerie Aurora <vaurora@redhat.com>
Whiteout an unlinked directory entry in a union mounted file system.
Signed-off-by: Valerie Aurora <valerie.aurora@gmail.com>
---
fs/namei.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index 531a0e0..83f9c62 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2698,11 +2698,6 @@ static long do_unlinkat(int dfd, const char __user *pathname)
if (nd.last_type != LAST_NORM)
goto exit1;
- /* unlink() on union mounts not implemented yet */
- error = -EINVAL;
- if (IS_DIR_UNIONED(nd.path.dentry))
- goto exit1;
-
nd.flags &= ~LOOKUP_PARENT;
mutex_lock_nested(&nd.path.dentry->d_inode->i_mutex, I_MUTEX_PARENT);
@@ -2720,6 +2715,10 @@ static long do_unlinkat(int dfd, const char __user *pathname)
error = security_path_unlink(&nd.path, path.dentry);
if (error)
goto exit3;
+ if (IS_DIR_UNIONED(nd.path.dentry)) {
+ error = do_whiteout(&nd, &path, 0);
+ goto exit3;
+ }
error = vfs_unlink(nd.path.dentry->d_inode, path.dentry);
exit3:
mnt_drop_write(nd.path.mnt);
--
1.7.0.4
next prev parent reply other threads:[~2011-03-23 2:05 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-23 2:04 [PATCH 44/74] union-mount: Temporarily disable some syscalls Valerie Aurora
2011-03-23 2:04 ` [PATCH 45/74] union-mount: Basic infrastructure of __lookup_union() Valerie Aurora
2011-03-23 2:04 ` [PATCH 46/74] union-mount: Process negative dentries in __lookup_union() Valerie Aurora
2011-03-23 2:04 ` [PATCH 47/74] union-mount: Return files found in lower layers " Valerie Aurora
2011-03-23 2:04 ` [PATCH 48/74] union-mount: Build union stack " Valerie Aurora
2011-03-23 2:04 ` [PATCH 49/74] union-mount: Follow mount " Valerie Aurora
2011-03-23 2:04 ` [PATCH 50/74] union-mount: Add lookup_union() Valerie Aurora
2011-03-23 2:04 ` [PATCH 51/74] union-mount: Add do_lookup_union() wrapper for __lookup_union() Valerie Aurora
2011-03-23 2:04 ` [PATCH 52/74] union-mount: Call union lookup functions in lookup path Valerie Aurora
2011-03-23 2:04 ` Valerie Aurora [this message]
2011-03-23 2:04 ` [PATCH 54/74] union-mount: Create whiteout on rmdir() Valerie Aurora
2011-03-23 2:04 ` [PATCH 55/74] union-mount: Set opaque flag on new directories in unioned file systems Valerie Aurora
2011-03-23 2:04 ` [PATCH 56/74] union-mount: Copy up directory entries on first readdir() Valerie Aurora
2011-03-23 2:04 ` [PATCH 57/74] union-mount: Add generic_readdir_fallthru() helper Valerie Aurora
2011-03-23 2:04 ` [PATCH 58/74] fallthru: ext2 support for lookup of d_type/d_ino in fallthrus Valerie Aurora
2011-03-23 2:04 ` [PATCH 59/74] fallthru: tmpfs " Valerie Aurora
2011-03-23 2:04 ` [PATCH 60/74] fallthru: jffs2 " Valerie Aurora
2011-03-23 2:04 ` [PATCH 61/74] VFS: Split inode_permission() and create path_permission() Valerie Aurora
2011-03-23 2:04 ` [PATCH 62/74] VFS: Create user_path_nd() to lookup both parent and target Valerie Aurora
2011-03-23 2:04 ` [PATCH 63/74] union-mount: In-kernel file copyup routines Valerie Aurora
2011-03-23 2:04 ` [PATCH 64/74] union-mount: Implement union-aware access()/faccessat() Valerie Aurora
2011-03-23 2:04 ` [PATCH 65/74] union-mount: Implement union-aware link() Valerie Aurora
2011-03-23 2:04 ` [PATCH 66/74] union-mount: Implement union-aware rename() Valerie Aurora
2011-03-23 2:04 ` [PATCH 67/74] union-mount: Implement union-aware writable open() Valerie Aurora
2011-03-23 2:04 ` [PATCH 68/74] union-mount: Implement union-aware chown() Valerie Aurora
2011-03-23 2:05 ` [PATCH 69/74] union-mount: Implement union-aware truncate() Valerie Aurora
2011-03-23 2:05 ` [PATCH 70/74] union-mount: Implement union-aware chmod()/fchmodat() Valerie Aurora
2011-03-23 2:05 ` [PATCH 71/74] union-mount: Implement union-aware lchown() Valerie Aurora
2011-03-23 2:05 ` [PATCH 72/74] union-mount: Implement union-aware utimensat() Valerie Aurora
2011-03-23 2:05 ` [PATCH 73/74] union-mount: Implement union-aware setxattr() Valerie Aurora
2011-03-23 2:05 ` [PATCH 74/74] union-mount: Implement union-aware lsetxattr() Valerie Aurora
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=1300845905-14433-10-git-send-email-valerie.aurora@gmail.com \
--to=valerie.aurora@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux@vger.kernel.org \
--cc=vaurora@redhat.com \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).