Call do_whiteout() when removing files and directories.
Signed-off-by: Jan Blunck <jblunck@xxxxxxx>
Signed-off-by: Valerie Aurora (Henson) <vaurora@xxxxxxxxxx>
---
fs/namei.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index 78eb973..4d68597 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2825,6 +2825,10 @@ static int do_whiteout(struct nameidata *nd, struct path *path, int isdir)
if (err)
goto out;
+ err = -ENOENT;
+ if (!dentry->d_inode)
+ goto out;
+
err = -ENOTEMPTY;
if (isdir && !directory_is_empty(path->dentry, path->mnt))
goto out;
@@ -2939,6 +2943,10 @@ static long do_rmdir(int dfd, const char __user *pathname)
error = hash_lookup_union(&nd, &nd.last, &path);
if (error)
goto exit2;
+ if (is_unionized(nd.path.dentry, nd.path.mnt)) {
+ error = do_whiteout(&nd, &path, 1);
+ goto exit3;
+ }
error = mnt_want_write(nd.path.mnt);
if (error)
goto exit3;
@@ -3027,6 +3035,10 @@ static long do_unlinkat(int dfd, const char __user *pathname)
inode = path.dentry->d_inode;
if (inode)
atomic_inc(&inode->i_count);
+ if (is_unionized(nd.path.dentry, nd.path.mnt)) {
+ error = do_whiteout(&nd, &path, 0);
+ goto exit2;
+ }
error = mnt_want_write(nd.path.mnt);
if (error)
goto exit2;
--
1.6.1.3
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
