commit a663ced6595a1b52164cb7dc57e3d10f05b98db6
Author: Erez Zadok <[email protected]>
Date: Thu Dec 3 19:19:01 2009 -0500
Unionfs: unlock lower parent inode correctly on error path
Bug fix: on some errors, lower directory inode may remain locked and hold a
reference. This was in ->create, ->symlink, and ->mknod.
Signed-off-by: Erez Zadok <[email protected]>
diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index eaac155..b6d3dbf 100644
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -124,7 +124,7 @@ static int unionfs_create(struct inode *dir, struct dentry
*dentry,
lower_parent_dentry = lock_parent(lower_dentry);
if (IS_ERR(lower_parent_dentry)) {
err = PTR_ERR(lower_parent_dentry);
- goto out;
+ goto out_unlock;
}
err = vfs_create(lower_parent_dentry->d_inode, lower_dentry, mode,
@@ -141,8 +141,8 @@ static int unionfs_create(struct inode *dir, struct dentry
*dentry,
}
}
+out_unlock:
unlock_dir(lower_parent_dentry);
-
out:
if (!err) {
unionfs_postcopyup_setmnt(dentry);
@@ -385,7 +385,7 @@ static int unionfs_symlink(struct inode *dir, struct dentry
*dentry,
lower_parent_dentry = lock_parent(lower_dentry);
if (IS_ERR(lower_parent_dentry)) {
err = PTR_ERR(lower_parent_dentry);
- goto out;
+ goto out_unlock;
}
mode = S_IALLUGO;
@@ -402,8 +402,8 @@ static int unionfs_symlink(struct inode *dir, struct dentry
*dentry,
}
}
+out_unlock:
unlock_dir(lower_parent_dentry);
-
out:
dput(wh_dentry);
kfree(name);
@@ -579,7 +579,7 @@ static int unionfs_mknod(struct inode *dir, struct dentry
*dentry, int mode,
lower_parent_dentry = lock_parent(lower_dentry);
if (IS_ERR(lower_parent_dentry)) {
err = PTR_ERR(lower_parent_dentry);
- goto out;
+ goto out_unlock;
}
err = vfs_mknod(lower_parent_dentry->d_inode, lower_dentry, mode, dev);
@@ -594,8 +594,8 @@ static int unionfs_mknod(struct inode *dir, struct dentry
*dentry, int mode,
}
}
+out_unlock:
unlock_dir(lower_parent_dentry);
-
out:
dput(wh_dentry);
kfree(name);
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
