From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Sun, 23 Dec 2007 21:30:19 +0000 (-0500)
Subject: Unionfs: minor cleanup in check_empty
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=633d6c72125b93bd0b6f105aeb3274b8e49fad5f;p=unionfs-2.6.39.y.git

Unionfs: minor cleanup in check_empty

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
---

diff --git a/fs/unionfs/dirhelper.c b/fs/unionfs/dirhelper.c
index b40090a4039..4b73bb65e66 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;
 		}