浏览代码

[patch 1/4] vfs: path_{get,put}() cleanups

Here are some more places where path_{get,put}() can be used instead of
dput()/mntput() pair.

Signed-off-by: Jan Blunck <jblunck@suse.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Jan Blunck 17 年之前
父节点
当前提交
c8e7f449b2
共有 2 个文件被更改,包括 9 次插入12 次删除
  1. 5 6
      fs/namei.c
  2. 4 6
      fs/pipe.c

+ 5 - 6
fs/namei.c

@@ -581,15 +581,13 @@ static __always_inline int link_path_walk(const char *name, struct nameidata *nd
 	int result;
 	int result;
 
 
 	/* make sure the stuff we saved doesn't go away */
 	/* make sure the stuff we saved doesn't go away */
-	dget(save.dentry);
-	mntget(save.mnt);
+	path_get(&save);
 
 
 	result = __link_path_walk(name, nd);
 	result = __link_path_walk(name, nd);
 	if (result == -ESTALE) {
 	if (result == -ESTALE) {
 		/* nd->path had been dropped */
 		/* nd->path had been dropped */
 		nd->path = save;
 		nd->path = save;
-		dget(nd->path.dentry);
-		mntget(nd->path.mnt);
+		path_get(&nd->path);
 		nd->flags |= LOOKUP_REVAL;
 		nd->flags |= LOOKUP_REVAL;
 		result = __link_path_walk(name, nd);
 		result = __link_path_walk(name, nd);
 	}
 	}
@@ -1216,8 +1214,9 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt,
 	nd->flags = flags;
 	nd->flags = flags;
 	nd->depth = 0;
 	nd->depth = 0;
 
 
-	nd->path.mnt = mntget(mnt);
-	nd->path.dentry = dget(dentry);
+	nd->path.dentry = dentry;
+	nd->path.mnt = mnt;
+	path_get(&nd->path);
 
 
 	retval = path_walk(name, nd);
 	retval = path_walk(name, nd);
 	if (unlikely(!retval && !audit_dummy_context() && nd->path.dentry &&
 	if (unlikely(!retval && !audit_dummy_context() && nd->path.dentry &&

+ 4 - 6
fs/pipe.c

@@ -1003,8 +1003,7 @@ struct file *create_write_pipe(void)
 void free_write_pipe(struct file *f)
 void free_write_pipe(struct file *f)
 {
 {
 	free_pipe_info(f->f_dentry->d_inode);
 	free_pipe_info(f->f_dentry->d_inode);
-	dput(f->f_path.dentry);
-	mntput(f->f_path.mnt);
+	path_put(&f->f_path);
 	put_filp(f);
 	put_filp(f);
 }
 }
 
 
@@ -1015,8 +1014,8 @@ struct file *create_read_pipe(struct file *wrf)
 		return ERR_PTR(-ENFILE);
 		return ERR_PTR(-ENFILE);
 
 
 	/* Grab pipe from the writer */
 	/* Grab pipe from the writer */
-	f->f_path.mnt = mntget(wrf->f_path.mnt);
-	f->f_path.dentry = dget(wrf->f_path.dentry);
+	f->f_path = wrf->f_path;
+	path_get(&wrf->f_path);
 	f->f_mapping = wrf->f_path.dentry->d_inode->i_mapping;
 	f->f_mapping = wrf->f_path.dentry->d_inode->i_mapping;
 
 
 	f->f_pos = 0;
 	f->f_pos = 0;
@@ -1068,8 +1067,7 @@ int do_pipe(int *fd)
  err_fdr:
  err_fdr:
 	put_unused_fd(fdr);
 	put_unused_fd(fdr);
  err_read_pipe:
  err_read_pipe:
-	dput(fr->f_dentry);
-	mntput(fr->f_vfsmnt);
+	path_put(&fr->f_path);
 	put_filp(fr);
 	put_filp(fr);
  err_write_pipe:
  err_write_pipe:
 	free_write_pipe(fw);
 	free_write_pipe(fw);