autofs: path_{get,put}() cleanups
Here are some more places where path_{get,put}() can be used instead of dput()/mntput() pair. Besides that it fixes a bug in autofs4_mount_busy() where mntput() was called before dput(). Signed-off-by: Jan Blunck <jblunck@suse.de> Cc: Ian Kent <raven@themaw.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
9d2de6ad2a
Коммит
868eb7a853
|
@ -73,8 +73,8 @@ static int autofs4_mount_busy(struct vfsmount *mnt, struct dentry *dentry)
|
|||
status = 0;
|
||||
done:
|
||||
DPRINTK("returning = %d", status);
|
||||
mntput(mnt);
|
||||
dput(dentry);
|
||||
mntput(mnt);
|
||||
return status;
|
||||
}
|
||||
|
||||
|
|
|
@ -146,17 +146,17 @@ static int autofs4_dir_open(struct inode *inode, struct file *file)
|
|||
|
||||
if (d_mountpoint(dentry)) {
|
||||
struct file *fp = NULL;
|
||||
struct vfsmount *fp_mnt = mntget(mnt);
|
||||
struct dentry *fp_dentry = dget(dentry);
|
||||
struct path fp_path = { .dentry = dentry, .mnt = mnt };
|
||||
|
||||
if (!autofs4_follow_mount(&fp_mnt, &fp_dentry)) {
|
||||
dput(fp_dentry);
|
||||
mntput(fp_mnt);
|
||||
path_get(&fp_path);
|
||||
|
||||
if (!autofs4_follow_mount(&fp_path.mnt, &fp_path.dentry)) {
|
||||
path_put(&fp_path);
|
||||
dcache_dir_close(inode, file);
|
||||
goto out;
|
||||
}
|
||||
|
||||
fp = dentry_open(fp_dentry, fp_mnt, file->f_flags);
|
||||
fp = dentry_open(fp_path.dentry, fp_path.mnt, file->f_flags);
|
||||
status = PTR_ERR(fp);
|
||||
if (IS_ERR(fp)) {
|
||||
dcache_dir_close(inode, file);
|
||||
|
|
Загрузка…
Ссылка в новой задаче