commit 08b3c028dd9282b3824b7609483e5af77cb6a70a
Author: Erez Zadok <[EMAIL PROTECTED]>
Date: Tue Dec 25 17:03:29 2007 -0500
Unionfs: minor cleanup in check_empty
Signed-off-by: Erez Zadok <[EMAIL PROTECTED]>
diff --git a/fs/unionfs/dirhelper.c b/fs/unionfs/dirhelper.c
index b40090a..4b73bb6 100644
--- a/fs/unionfs/dirhelper.c
+++ b/fs/unionfs/dirhelper.c
@@ -182,6 +182,7 @@ int check_empty(struct dentry *dentry, struct
unionfs_dir_state **namelist)
{
int err = 0;
struct dentry *lower_dentry = NULL;
+ struct vfsmount *mnt;
struct super_block *sb;
struct file *lower_file;
struct unionfs_rdutil_callback *buf = NULL;
@@ -226,15 +227,11 @@ int check_empty(struct dentry *dentry, struct
unionfs_dir_state **namelist)
continue;
dget(lower_dentry);
- unionfs_mntget(dentry, bindex);
+ mnt = unionfs_mntget(dentry, bindex);
branchget(sb, bindex);
- lower_file =
- dentry_open(lower_dentry,
- unionfs_lower_mnt_idx(dentry, bindex),
- O_RDONLY);
+ lower_file = dentry_open(lower_dentry, mnt, O_RDONLY);
if (IS_ERR(lower_file)) {
err = PTR_ERR(lower_file);
- dput(lower_dentry);
branchput(sb, bindex);
goto out;
}
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
