Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78f71eff authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Al Viro
Browse files

vfs: do_dentry_open(): don't put filp 



Move put_filp() out to __dentry_open(), the only caller now.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 90ad1a8e

fs/open.c

+2 −1
Original line number Diff line number Diff line
@@ -747,7 +747,6 @@ static struct file *do_dentry_open(struct dentry *dentry, struct vfsmount *mnt, 
	f->f_path.dentry = NULL;

	f->f_path.mnt = NULL;

cleanup_file:

	put_filp(f);

	dput(dentry);

	mntput(mnt);

	return ERR_PTR(error);
@@ -765,6 +764,8 @@ static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt, 
			fput(res);

			res = ERR_PTR(error);

		}

	} else {

		put_filp(f);

	}

	return res;

}