microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Introduce path_put() 

* Add path_put() functions for releasing a reference to the dentry and
  vfsmount of a struct path in the right order

* Switch from path_release(nd) to path_put(&nd->path)

* Rename dput_path() to path_put_conditional()

[akpm@linux-foundation.org: fix cifs]
Signed-off-by: Jan Blunck <jblunck@suse.de>
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Acked-by: Christoph Hellwig <hch@lst.de>
Cc: <linux-fsdevel@vger.kernel.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Steven French <sfrench@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jan Blunck 2008-02-14 19:34:35 -08:00 коммит произвёл Linus Torvalds
Родитель 4ac9137858
Коммит 1d957f9bf8
41 изменённых файлов: 125 добавлений и 118 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
arch/alpha/kernel/osf_sys.c
Просмотреть файл

@ -260,7 +260,7 @@ osf_statfs(char __user *path, struct osf_statfs __user *buffer, unsigned long bu
retval = user_path_walk(path, &nd); retval = user_path_walk(path, &nd);
if (!retval) { if (!retval) {
retval = do_osf_statfs(nd.path.dentry, buffer, bufsiz); retval = do_osf_statfs(nd.path.dentry, buffer, bufsiz);
path_release(&nd); path_put(&nd.path);
} }
return retval; return retval;
} }

6
arch/mips/kernel/sysirix.c
Просмотреть файл

@ -711,7 +711,7 @@ asmlinkage int irix_statfs(const char __user *path,
} }
dput_and_out: dput_and_out:
path_release(&nd); path_put(&nd.path);
out: out:
return error; return error;
} }
@ -1385,7 +1385,7 @@ asmlinkage int irix_statvfs(char __user *fname, struct irix_statvfs __user *buf)
error |= __put_user(0, &buf->f_fstr[i]); error |= __put_user(0, &buf->f_fstr[i]);
dput_and_out: dput_and_out:
path_release(&nd); path_put(&nd.path);
out: out:
return error; return error;
} }
@ -1636,7 +1636,7 @@ asmlinkage int irix_statvfs64(char __user *fname, struct irix_statvfs64 __user *
error |= __put_user(0, &buf->f_fstr[i]); error |= __put_user(0, &buf->f_fstr[i]);
dput_and_out: dput_and_out:
path_release(&nd); path_put(&nd.path);
out: out:
return error; return error;
} }

2
arch/parisc/hpux/sys_hpux.c
Просмотреть файл

@ -222,7 +222,7 @@ asmlinkage long hpux_statfs(const char __user *path,
error = vfs_statfs_hpux(nd.path.dentry, &tmp); error = vfs_statfs_hpux(nd.path.dentry, &tmp);
if (!error && copy_to_user(buf, &tmp, sizeof(tmp))) if (!error && copy_to_user(buf, &tmp, sizeof(tmp)))
error = -EFAULT; error = -EFAULT;
path_release(&nd); path_put(&nd.path);
} }
return error; return error;
} }

2
arch/powerpc/platforms/cell/spufs/syscalls.c
Просмотреть файл

@ -73,7 +73,7 @@ static long do_spu_create(const char __user *pathname, unsigned int flags,
LOOKUP_OPEN|LOOKUP_CREATE, &nd); LOOKUP_OPEN|LOOKUP_CREATE, &nd);
if (!ret) { if (!ret) {
ret = spufs_create(&nd, flags, mode, neighbor); ret = spufs_create(&nd, flags, mode, neighbor);
path_release(&nd); path_put(&nd.path);
} }
putname(tmp); putname(tmp);
} }

4
arch/sparc64/solaris/fs.c
Просмотреть файл

@ -436,7 +436,7 @@ asmlinkage int solaris_statvfs(u32 path, u32 buf)
if (!error) { if (!error) {
struct inode *inode = nd.path.dentry->d_inode; struct inode *inode = nd.path.dentry->d_inode;
error = report_statvfs(nd.path.mnt, inode, buf); error = report_statvfs(nd.path.mnt, inode, buf);
path_release(&nd); path_put(&nd.path);
} }
return error; return error;
} }
@ -466,7 +466,7 @@ asmlinkage int solaris_statvfs64(u32 path, u32 buf)
if (!error) { if (!error) {
struct inode *inode = nd.path.dentry->d_inode; struct inode *inode = nd.path.dentry->d_inode;
error = report_statvfs64(nd.path.mnt, inode, buf); error = report_statvfs64(nd.path.mnt, inode, buf);
path_release(&nd); path_put(&nd.path);
} }
unlock_kernel(); unlock_kernel();
return error; return error;

2
drivers/md/dm-table.c
Просмотреть файл

@ -375,7 +375,7 @@ static int lookup_device(const char *path, dev_t *dev)
*dev = inode->i_rdev; *dev = inode->i_rdev;
out: out:
path_release(&nd); path_put(&nd.path);
return r; return r;
} }

4
drivers/mtd/mtdsuper.c
Просмотреть файл

@ -203,7 +203,7 @@ int get_sb_mtd(struct file_system_type *fs_type, int flags,
goto not_an_MTD_device; goto not_an_MTD_device;
mtdnr = iminor(nd.path.dentry->d_inode); mtdnr = iminor(nd.path.dentry->d_inode);
path_release(&nd); path_put(&nd.path);
return get_sb_mtd_nr(fs_type, flags, dev_name, data, mtdnr, fill_super, return get_sb_mtd_nr(fs_type, flags, dev_name, data, mtdnr, fill_super,
mnt); mnt);
@ -214,7 +214,7 @@ not_an_MTD_device:
"MTD: Attempt to mount non-MTD device \"%s\"\n", "MTD: Attempt to mount non-MTD device \"%s\"\n",
dev_name); dev_name);
out: out:
path_release(&nd); path_put(&nd.path);
return ret; return ret;
} }

2
fs/afs/mntpt.c
Просмотреть файл

@ -227,7 +227,7 @@ static void *afs_mntpt_follow_link(struct dentry *dentry, struct nameidata *nd)
newmnt = afs_mntpt_do_automount(nd->path.dentry); newmnt = afs_mntpt_do_automount(nd->path.dentry);
if (IS_ERR(newmnt)) { if (IS_ERR(newmnt)) {
path_release(nd); path_put(&nd->path);
return (void *)newmnt; return (void *)newmnt;
} }

2
fs/autofs4/root.c
Просмотреть файл

@ -383,7 +383,7 @@ done:
return NULL; return NULL;
out_error: out_error:
path_release(nd); path_put(&nd->path);
return ERR_PTR(status); return ERR_PTR(status);
} }

2
fs/block_dev.c
Просмотреть файл

@ -1409,7 +1409,7 @@ struct block_device *lookup_bdev(const char *path)
if (!bdev) if (!bdev)
goto fail; goto fail;
out: out:
path_release(&nd); path_put(&nd.path);
return bdev; return bdev;
fail: fail:
bdev = ERR_PTR(error); bdev = ERR_PTR(error);

2
fs/cifs/cifs_dfs_ref.c
Просмотреть файл

@ -368,7 +368,7 @@ out:
cFYI(1, ("leaving %s" , __FUNCTION__)); cFYI(1, ("leaving %s" , __FUNCTION__));
return ERR_PTR(rc); return ERR_PTR(rc);
out_err: out_err:
path_release(nd); path_put(&nd->path);
goto out; goto out;
} }

4
fs/coda/pioctl.c
Просмотреть файл

@ -80,7 +80,7 @@ static int coda_pioctl(struct inode * inode, struct file * filp,
/* return if it is not a Coda inode */ /* return if it is not a Coda inode */
if ( target_inode->i_sb != inode->i_sb ) { if ( target_inode->i_sb != inode->i_sb ) {
path_release(&nd); path_put(&nd.path);
return -EINVAL; return -EINVAL;
} }
@ -89,7 +89,7 @@ static int coda_pioctl(struct inode * inode, struct file * filp,
error = venus_pioctl(inode->i_sb, &(cnp->c_fid), cmd, &data); error = venus_pioctl(inode->i_sb, &(cnp->c_fid), cmd, &data);
path_release(&nd); path_put(&nd.path);
return error; return error;
} }

4
fs/compat.c
Просмотреть файл

@ -244,7 +244,7 @@ asmlinkage long compat_sys_statfs(const char __user *path, struct compat_statfs
error = vfs_statfs(nd.path.dentry, &tmp); error = vfs_statfs(nd.path.dentry, &tmp);
if (!error) if (!error)
error = put_compat_statfs(buf, &tmp); error = put_compat_statfs(buf, &tmp);
path_release(&nd); path_put(&nd.path);
} }
return error; return error;
} }
@ -312,7 +312,7 @@ asmlinkage long compat_sys_statfs64(const char __user *path, compat_size_t sz, s
error = vfs_statfs(nd.path.dentry, &tmp); error = vfs_statfs(nd.path.dentry, &tmp);
if (!error) if (!error)
error = put_compat_statfs64(buf, &tmp); error = put_compat_statfs64(buf, &tmp);
path_release(&nd); path_put(&nd.path);
} }
return error; return error;
} }

4
fs/configfs/symlink.c
Просмотреть файл

@ -103,7 +103,7 @@ static int get_target(const char *symname, struct nameidata *nd,
*target = configfs_get_config_item(nd->path.dentry); *target = configfs_get_config_item(nd->path.dentry);
if (!*target) { if (!*target) {
ret = -ENOENT; ret = -ENOENT;
path_release(nd); path_put(&nd->path);
} }
} else } else
ret = -EPERM; ret = -EPERM;
@ -141,7 +141,7 @@ int configfs_symlink(struct inode *dir, struct dentry *dentry, const char *symna
ret = create_link(parent_item, target_item, dentry); ret = create_link(parent_item, target_item, dentry);
config_item_put(target_item); config_item_put(target_item);
path_release(&nd); path_put(&nd.path);
out_put: out_put:
config_item_put(parent_item); config_item_put(parent_item);

2
fs/dquot.c
Просмотреть файл

@ -1643,7 +1643,7 @@ int vfs_quota_on(struct super_block *sb, int type, int format_id, char *path)
error = vfs_quota_on_inode(nd.path.dentry->d_inode, type, error = vfs_quota_on_inode(nd.path.dentry->d_inode, type,
format_id); format_id);
out_path: out_path:
path_release(&nd); path_put(&nd.path);
return error; return error;
} }

2
fs/ecryptfs/main.c
Просмотреть файл

@ -526,7 +526,7 @@ static int ecryptfs_read_super(struct super_block *sb, const char *dev_name)
rc = 0; rc = 0;
goto out; goto out;
out_free: out_free:
path_release(&nd); path_put(&nd.path);
out: out:
return rc; return rc;
} }

4
fs/exec.c
Просмотреть файл

@ -148,7 +148,7 @@ out:
return error; return error;
exit: exit:
release_open_intent(&nd); release_open_intent(&nd);
path_release(&nd); path_put(&nd.path);
goto out; goto out;
} }
@ -672,7 +672,7 @@ out:
} }
} }
release_open_intent(&nd); release_open_intent(&nd);
path_release(&nd); path_put(&nd.path);
} }
goto out; goto out;
} }

4
fs/ext3/super.c
Просмотреть файл

@ -2759,7 +2759,7 @@ static int ext3_quota_on(struct super_block *sb, int type, int format_id,
return err; return err;
/* Quotafile not on the same filesystem? */ /* Quotafile not on the same filesystem? */
if (nd.path.mnt->mnt_sb != sb) { if (nd.path.mnt->mnt_sb != sb) {
path_release(&nd); path_put(&nd.path);
return -EXDEV; return -EXDEV;
} }
/* Quotafile not of fs root? */ /* Quotafile not of fs root? */
@ -2767,7 +2767,7 @@ static int ext3_quota_on(struct super_block *sb, int type, int format_id,
printk(KERN_WARNING printk(KERN_WARNING
"EXT3-fs: Quota file not on filesystem root. " "EXT3-fs: Quota file not on filesystem root. "
"Journalled quota will not work.\n"); "Journalled quota will not work.\n");
path_release(&nd); path_put(&nd.path);
return vfs_quota_on(sb, type, format_id, path); return vfs_quota_on(sb, type, format_id, path);
} }

4
fs/ext4/super.c
Просмотреть файл

@ -3159,7 +3159,7 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id,
return err; return err;
/* Quotafile not on the same filesystem? */ /* Quotafile not on the same filesystem? */
if (nd.path.mnt->mnt_sb != sb) { if (nd.path.mnt->mnt_sb != sb) {
path_release(&nd); path_put(&nd.path);
return -EXDEV; return -EXDEV;
} }
/* Quotafile not of fs root? */ /* Quotafile not of fs root? */
@ -3167,7 +3167,7 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id,
printk(KERN_WARNING printk(KERN_WARNING
"EXT4-fs: Quota file not on filesystem root. " "EXT4-fs: Quota file not on filesystem root. "
"Journalled quota will not work.\n"); "Journalled quota will not work.\n");
path_release(&nd); path_put(&nd.path);
return vfs_quota_on(sb, type, format_id, path); return vfs_quota_on(sb, type, format_id, path);
} }

2
fs/gfs2/ops_fstype.c
Просмотреть файл

@ -900,7 +900,7 @@ static struct super_block* get_gfs2_sb(const char *dev_name)
"mount point %s\n", dev_name); "mount point %s\n", dev_name);
free_nd: free_nd:
path_release(&nd); path_put(&nd.path);
out: out:
return sb; return sb;
} }

4
fs/inotify_user.c
Просмотреть файл

@ -367,7 +367,7 @@ static int find_inode(const char __user *dirname, struct nameidata *nd,
/* you can only watch an inode if you have read permissions on it */ /* you can only watch an inode if you have read permissions on it */
error = vfs_permission(nd, MAY_READ); error = vfs_permission(nd, MAY_READ);
if (error) if (error)
path_release(nd); path_put(&nd->path);
return error; return error;
} }
@ -676,7 +676,7 @@ asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask)
ret = create_watch(dev, inode, mask); ret = create_watch(dev, inode, mask);
mutex_unlock(&dev->up_mutex); mutex_unlock(&dev->up_mutex);
path_release(&nd); path_put(&nd.path);
fput_and_out: fput_and_out:
fput_light(filp, fput_needed); fput_light(filp, fput_needed);
return ret; return ret;

56
fs/namei.c
Просмотреть файл

@ -362,11 +362,18 @@ int deny_write_access(struct file * file)
return 0; return 0;
} }
void path_release(struct nameidata *nd) /**
* path_put - put a reference to a path
* @path: path to put the reference to
*
* Given a path decrement the reference count to the dentry and the vfsmount.
*/
void path_put(struct path *path)
{ {
dput(nd->path.dentry); dput(path->dentry);
mntput(nd->path.mnt); mntput(path->mnt);
} }
EXPORT_SYMBOL(path_put);
/** /**
* release_open_intent - free up open intent resources * release_open_intent - free up open intent resources
@ -551,7 +558,7 @@ static __always_inline int __vfs_follow_link(struct nameidata *nd, const char *l
goto fail; goto fail;
if (*link == '/') { if (*link == '/') {
path_release(nd); path_put(&nd->path);
if (!walk_init_root(link, nd)) if (!walk_init_root(link, nd))
/* weird __emul_prefix() stuff did it */ /* weird __emul_prefix() stuff did it */
goto out; goto out;
@ -567,18 +574,18 @@ out:
*/ */
name = __getname(); name = __getname();
if (unlikely(!name)) { if (unlikely(!name)) {
path_release(nd); path_put(&nd->path);
return -ENOMEM; return -ENOMEM;
} }
strcpy(name, nd->last.name); strcpy(name, nd->last.name);
nd->last.name = name; nd->last.name = name;
return 0; return 0;
fail: fail:
path_release(nd); path_put(&nd->path);
return PTR_ERR(link); return PTR_ERR(link);
} }
static inline void dput_path(struct path *path, struct nameidata *nd) static void path_put_conditional(struct path *path, struct nameidata *nd)
{ {
dput(path->dentry); dput(path->dentry);
if (path->mnt != nd->path.mnt) if (path->mnt != nd->path.mnt)
@ -651,8 +658,8 @@ static inline int do_follow_link(struct path *path, struct nameidata *nd)
nd->depth--; nd->depth--;
return err; return err;
loop: loop:
dput_path(path, nd); path_put_conditional(path, nd);
path_release(nd); path_put(&nd->path);
return err; return err;
} }
@ -993,10 +1000,10 @@ return_reval:
return_base: return_base:
return 0; return 0;
out_dput: out_dput:
dput_path(&next, nd); path_put_conditional(&next, nd);
break; break;
} }
path_release(nd); path_put(&nd->path);
return_err: return_err:
return err; return err;
} }
@ -1070,7 +1077,7 @@ static int __emul_lookup_dentry(const char *name, struct nameidata *nd)
mntput(old_mnt); mntput(old_mnt);
return 1; return 1;
} }
path_release(nd); path_put(&nd->path);
} }
nd->path.dentry = old_dentry; nd->path.dentry = old_dentry;
nd->path.mnt = old_mnt; nd->path.mnt = old_mnt;
@ -1230,7 +1237,7 @@ static int __path_lookup_intent_open(int dfd, const char *name,
if (IS_ERR(nd->intent.open.file)) { if (IS_ERR(nd->intent.open.file)) {
if (err == 0) { if (err == 0) {
err = PTR_ERR(nd->intent.open.file); err = PTR_ERR(nd->intent.open.file);
path_release(nd); path_put(&nd->path);
} }
} else if (err != 0) } else if (err != 0)
release_open_intent(nd); release_open_intent(nd);
@ -1806,11 +1813,11 @@ ok:
return 0; return 0;
exit_dput: exit_dput:
dput_path(&path, nd); path_put_conditional(&path, nd);
exit: exit:
if (!IS_ERR(nd->intent.open.file)) if (!IS_ERR(nd->intent.open.file))
release_open_intent(nd); release_open_intent(nd);
path_release(nd); path_put(&nd->path);
return error; return error;
do_link: do_link:
@ -1979,7 +1986,7 @@ asmlinkage long sys_mknodat(int dfd, const char __user *filename, int mode,
dput(dentry); dput(dentry);
} }
mutex_unlock(&nd.path.dentry->d_inode->i_mutex); mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
path_release(&nd); path_put(&nd.path);
out: out:
putname(tmp); putname(tmp);
@ -2039,7 +2046,7 @@ asmlinkage long sys_mkdirat(int dfd, const char __user *pathname, int mode)
dput(dentry); dput(dentry);
out_unlock: out_unlock:
mutex_unlock(&nd.path.dentry->d_inode->i_mutex); mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
path_release(&nd); path_put(&nd.path);
out: out:
putname(tmp); putname(tmp);
out_err: out_err:
@ -2147,7 +2154,7 @@ static long do_rmdir(int dfd, const char __user *pathname)
exit2: exit2:
mutex_unlock(&nd.path.dentry->d_inode->i_mutex); mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
exit1: exit1:
path_release(&nd); path_put(&nd.path);
exit: exit:
putname(name); putname(name);
return error; return error;
@ -2231,7 +2238,7 @@ static long do_unlinkat(int dfd, const char __user *pathname)
if (inode) if (inode)
iput(inode); /* truncate the inode here */ iput(inode); /* truncate the inode here */
exit1: exit1:
path_release(&nd); path_put(&nd.path);
exit: exit:
putname(name); putname(name);
return error; return error;
@ -2308,7 +2315,7 @@ asmlinkage long sys_symlinkat(const char __user *oldname,
dput(dentry); dput(dentry);
out_unlock: out_unlock:
mutex_unlock(&nd.path.dentry->d_inode->i_mutex); mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
path_release(&nd); path_put(&nd.path);
out: out:
putname(to); putname(to);
out_putname: out_putname:
@ -2404,9 +2411,9 @@ asmlinkage long sys_linkat(int olddfd, const char __user *oldname,
out_unlock: out_unlock:
mutex_unlock(&nd.path.dentry->d_inode->i_mutex); mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
out_release: out_release:
path_release(&nd); path_put(&nd.path);
out: out:
path_release(&old_nd); path_put(&old_nd.path);
exit: exit:
putname(to); putname(to);
@ -2634,9 +2641,9 @@ exit4:
exit3: exit3:
unlock_rename(new_dir, old_dir); unlock_rename(new_dir, old_dir);
exit2: exit2:
path_release(&newnd); path_put(&newnd.path);
exit1: exit1:
path_release(&oldnd); path_put(&oldnd.path);
exit: exit:
return error; return error;
} }
@ -2810,7 +2817,6 @@ EXPORT_SYMBOL(page_symlink);
EXPORT_SYMBOL(page_symlink_inode_operations); EXPORT_SYMBOL(page_symlink_inode_operations);
EXPORT_SYMBOL(path_lookup); EXPORT_SYMBOL(path_lookup);
EXPORT_SYMBOL(vfs_path_lookup); EXPORT_SYMBOL(vfs_path_lookup);
EXPORT_SYMBOL(path_release);
EXPORT_SYMBOL(permission); EXPORT_SYMBOL(permission);
EXPORT_SYMBOL(vfs_permission); EXPORT_SYMBOL(vfs_permission);
EXPORT_SYMBOL(file_permission); EXPORT_SYMBOL(file_permission);

20
fs/namespace.c
Просмотреть файл

@ -1007,7 +1007,7 @@ static noinline int do_loopback(struct nameidata *nd, char *old_name,
out: out:
up_write(&namespace_sem); up_write(&namespace_sem);
path_release(&old_nd); path_put(&old_nd.path);
return err; return err;
} }
@ -1126,8 +1126,8 @@ out1:
out: out:
up_write(&namespace_sem); up_write(&namespace_sem);
if (!err) if (!err)
path_release(&parent_nd); path_put(&parent_nd.path);
path_release(&old_nd); path_put(&old_nd.path);
return err; return err;
} }
@ -1512,7 +1512,7 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
retval = do_new_mount(&nd, type_page, flags, mnt_flags, retval = do_new_mount(&nd, type_page, flags, mnt_flags,
dev_name, data_page); dev_name, data_page);
dput_out: dput_out:
path_release(&nd); path_put(&nd.path);
return retval; return retval;
} }
@ -1768,7 +1768,7 @@ asmlinkage long sys_pivot_root(const char __user * new_root,
error = security_sb_pivotroot(&old_nd, &new_nd); error = security_sb_pivotroot(&old_nd, &new_nd);
if (error) { if (error) {
path_release(&old_nd); path_put(&old_nd.path);
goto out1; goto out1;
} }
@ -1831,15 +1831,15 @@ asmlinkage long sys_pivot_root(const char __user * new_root,
chroot_fs_refs(&user_nd, &new_nd); chroot_fs_refs(&user_nd, &new_nd);
security_sb_post_pivotroot(&user_nd, &new_nd); security_sb_post_pivotroot(&user_nd, &new_nd);
error = 0; error = 0;
path_release(&root_parent); path_put(&root_parent.path);
path_release(&parent_nd); path_put(&parent_nd.path);
out2: out2:
mutex_unlock(&old_nd.path.dentry->d_inode->i_mutex); mutex_unlock(&old_nd.path.dentry->d_inode->i_mutex);
up_write(&namespace_sem); up_write(&namespace_sem);
path_release(&user_nd); path_put(&user_nd.path);
path_release(&old_nd); path_put(&old_nd.path);
out1: out1:
path_release(&new_nd); path_put(&new_nd.path);
out0: out0:
unlock_kernel(); unlock_kernel();
return error; return error;

2
fs/nfs/namespace.c
Просмотреть файл

@ -148,7 +148,7 @@ out:
dprintk("<-- nfs_follow_mountpoint() = %d\n", err); dprintk("<-- nfs_follow_mountpoint() = %d\n", err);
return ERR_PTR(err); return ERR_PTR(err);
out_err: out_err:
path_release(nd); path_put(&nd->path);
goto out; goto out;
out_follow: out_follow:
while (d_mountpoint(nd->path.dentry) && while (d_mountpoint(nd->path.dentry) &&

2
fs/nfsctl.c
Просмотреть файл

@ -43,7 +43,7 @@ static struct file *do_open(char *name, int flags)
if (!error) if (!error)
return dentry_open(nd.path.dentry, nd.path.mnt, flags); return dentry_open(nd.path.dentry, nd.path.mnt, flags);
path_release(&nd); path_put(&nd.path);
return ERR_PTR(error); return ERR_PTR(error);
} }

10
fs/nfsd/export.c
Просмотреть файл

@ -177,7 +177,7 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen)
cache_put(&ek->h, &svc_expkey_cache); cache_put(&ek->h, &svc_expkey_cache);
else else
err = -ENOMEM; err = -ENOMEM;
path_release(&nd); path_put(&nd.path);
} }
cache_flush(); cache_flush();
out: out:
@ -630,7 +630,7 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen)
kfree(exp.ex_uuid); kfree(exp.ex_uuid);
kfree(exp.ex_path); kfree(exp.ex_path);
if (nd.path.dentry) if (nd.path.dentry)
path_release(&nd); path_put(&nd.path);
out_no_path: out_no_path:
if (dom) if (dom)
auth_domain_put(dom); auth_domain_put(dom);
@ -1098,7 +1098,7 @@ finish:
cache_put(&fsid_key->h, &svc_expkey_cache); cache_put(&fsid_key->h, &svc_expkey_cache);
if (clp) if (clp)
auth_domain_put(clp); auth_domain_put(clp);
path_release(&nd); path_put(&nd.path);
out_unlock: out_unlock:
exp_writeunlock(); exp_writeunlock();
out: out:
@ -1150,7 +1150,7 @@ exp_unexport(struct nfsctl_export *nxp)
err = -EINVAL; err = -EINVAL;
exp = exp_get_by_name(dom, nd.path.mnt, nd.path.dentry, NULL); exp = exp_get_by_name(dom, nd.path.mnt, nd.path.dentry, NULL);
path_release(&nd); path_put(&nd.path);
if (IS_ERR(exp)) if (IS_ERR(exp))
goto out_domain; goto out_domain;
@ -1209,7 +1209,7 @@ exp_rootfh(svc_client *clp, char *path, struct knfsd_fh *f, int maxsize)
fh_put(&fh); fh_put(&fh);
exp_put(exp); exp_put(exp);
out: out:
path_release(&nd); path_put(&nd.path);
return err; return err;
} }

2
fs/nfsd/nfs4recover.c
Просмотреть файл

@ -415,5 +415,5 @@ nfsd4_shutdown_recdir(void)
if (!rec_dir_init) if (!rec_dir_init)
return; return;
rec_dir_init = 0; rec_dir_init = 0;
path_release(&rec_dir); path_put(&rec_dir.path);
} }

2
fs/nfsd/nfs4state.c
Просмотреть файл

@ -3265,7 +3265,7 @@ nfs4_reset_recoverydir(char *recdir)
nfs4_set_recdir(recdir); nfs4_set_recdir(recdir);
status = 0; status = 0;
} }
path_release(&nd); path_put(&nd.path);
return status; return status;
} }

22
fs/open.c
Просмотреть файл

@ -130,7 +130,7 @@ asmlinkage long sys_statfs(const char __user * path, struct statfs __user * buf)
error = vfs_statfs_native(nd.path.dentry, &tmp); error = vfs_statfs_native(nd.path.dentry, &tmp);
if (!error && copy_to_user(buf, &tmp, sizeof(tmp))) if (!error && copy_to_user(buf, &tmp, sizeof(tmp)))
error = -EFAULT; error = -EFAULT;
path_release(&nd); path_put(&nd.path);
} }
return error; return error;
} }
@ -149,7 +149,7 @@ asmlinkage long sys_statfs64(const char __user *path, size_t sz, struct statfs64
error = vfs_statfs64(nd.path.dentry, &tmp); error = vfs_statfs64(nd.path.dentry, &tmp);
if (!error && copy_to_user(buf, &tmp, sizeof(tmp))) if (!error && copy_to_user(buf, &tmp, sizeof(tmp)))
error = -EFAULT; error = -EFAULT;
path_release(&nd); path_put(&nd.path);
} }
return error; return error;
} }
@ -277,7 +277,7 @@ static long do_sys_truncate(const char __user * path, loff_t length)
put_write_and_out: put_write_and_out:
put_write_access(inode); put_write_access(inode);
dput_and_out: dput_and_out:
path_release(&nd); path_put(&nd.path);
out: out:
return error; return error;
} }
@ -462,7 +462,7 @@ asmlinkage long sys_faccessat(int dfd, const char __user *filename, int mode)
res = -EROFS; res = -EROFS;
out_path_release: out_path_release:
path_release(&nd); path_put(&nd.path);
out: out:
current->fsuid = old_fsuid; current->fsuid = old_fsuid;
current->fsgid = old_fsgid; current->fsgid = old_fsgid;
@ -493,7 +493,7 @@ asmlinkage long sys_chdir(const char __user * filename)
set_fs_pwd(current->fs, nd.path.mnt, nd.path.dentry); set_fs_pwd(current->fs, nd.path.mnt, nd.path.dentry);
dput_and_out: dput_and_out:
path_release(&nd); path_put(&nd.path);
out: out:
return error; return error;
} }
@ -549,7 +549,7 @@ asmlinkage long sys_chroot(const char __user * filename)
set_fs_altroot(); set_fs_altroot();
error = 0; error = 0;
dput_and_out: dput_and_out:
path_release(&nd); path_put(&nd.path);
out: out:
return error; return error;
} }
@ -621,7 +621,7 @@ asmlinkage long sys_fchmodat(int dfd, const char __user *filename,
mutex_unlock(&inode->i_mutex); mutex_unlock(&inode->i_mutex);
dput_and_out: dput_and_out:
path_release(&nd); path_put(&nd.path);
out: out:
return error; return error;
} }
@ -676,7 +676,7 @@ asmlinkage long sys_chown(const char __user * filename, uid_t user, gid_t group)
if (error) if (error)
goto out; goto out;
error = chown_common(nd.path.dentry, user, group); error = chown_common(nd.path.dentry, user, group);
path_release(&nd); path_put(&nd.path);
out: out:
return error; return error;
} }
@ -696,7 +696,7 @@ asmlinkage long sys_fchownat(int dfd, const char __user *filename, uid_t user,
if (error) if (error)
goto out; goto out;
error = chown_common(nd.path.dentry, user, group); error = chown_common(nd.path.dentry, user, group);
path_release(&nd); path_put(&nd.path);
out: out:
return error; return error;
} }
@ -710,7 +710,7 @@ asmlinkage long sys_lchown(const char __user * filename, uid_t user, gid_t group
if (error) if (error)
goto out; goto out;
error = chown_common(nd.path.dentry, user, group); error = chown_common(nd.path.dentry, user, group);
path_release(&nd); path_put(&nd.path);
out: out:
return error; return error;
} }
@ -894,7 +894,7 @@ struct file *nameidata_to_filp(struct nameidata *nd, int flags)
filp = __dentry_open(nd->path.dentry, nd->path.mnt, flags, filp, filp = __dentry_open(nd->path.dentry, nd->path.mnt, flags, filp,
NULL); NULL);
else else
path_release(nd); path_put(&nd->path);
return filp; return filp;
} }

2
fs/proc/base.c
Просмотреть файл

@ -1164,7 +1164,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
int error = -EACCES; int error = -EACCES;
/* We don't need a base pointer in the /proc filesystem */ /* We don't need a base pointer in the /proc filesystem */
path_release(nd); path_put(&nd->path);
/* Are we allowed to snoop on the tasks file descriptors? */ /* Are we allowed to snoop on the tasks file descriptors? */
if (!proc_fd_access_allowed(inode)) if (!proc_fd_access_allowed(inode))

8
fs/reiserfs/super.c
Просмотреть файл

@ -2027,20 +2027,20 @@ static int reiserfs_quota_on(struct super_block *sb, int type, int format_id,
return err; return err;
/* Quotafile not on the same filesystem? */ /* Quotafile not on the same filesystem? */
if (nd.path.mnt->mnt_sb != sb) { if (nd.path.mnt->mnt_sb != sb) {
path_release(&nd); path_put(&nd.path);
return -EXDEV; return -EXDEV;
} }
/* We must not pack tails for quota files on reiserfs for quota IO to work */ /* We must not pack tails for quota files on reiserfs for quota IO to work */
if (!REISERFS_I(nd.path.dentry->d_inode)->i_flags & i_nopack_mask) { if (!REISERFS_I(nd.path.dentry->d_inode)->i_flags & i_nopack_mask) {
reiserfs_warning(sb, reiserfs_warning(sb,
"reiserfs: Quota file must have tail packing disabled."); "reiserfs: Quota file must have tail packing disabled.");
path_release(&nd); path_put(&nd.path);
return -EINVAL; return -EINVAL;
} }
/* Not journalling quota? No more tests needed... */ /* Not journalling quota? No more tests needed... */
if (!REISERFS_SB(sb)->s_qf_names[USRQUOTA] && if (!REISERFS_SB(sb)->s_qf_names[USRQUOTA] &&
!REISERFS_SB(sb)->s_qf_names[GRPQUOTA]) { !REISERFS_SB(sb)->s_qf_names[GRPQUOTA]) {
path_release(&nd); path_put(&nd.path);
return vfs_quota_on(sb, type, format_id, path); return vfs_quota_on(sb, type, format_id, path);
} }
/* Quotafile not of fs root? */ /* Quotafile not of fs root? */
@ -2048,7 +2048,7 @@ static int reiserfs_quota_on(struct super_block *sb, int type, int format_id,
reiserfs_warning(sb, reiserfs_warning(sb,
"reiserfs: Quota file not on filesystem root. " "reiserfs: Quota file not on filesystem root. "
"Journalled quota will not work."); "Journalled quota will not work.");
path_release(&nd); path_put(&nd.path);
return vfs_quota_on(sb, type, format_id, path); return vfs_quota_on(sb, type, format_id, path);
} }

6
fs/stat.c
Просмотреть файл

@ -63,7 +63,7 @@ int vfs_stat_fd(int dfd, char __user *name, struct kstat *stat)
error = __user_walk_fd(dfd, name, LOOKUP_FOLLOW, &nd); error = __user_walk_fd(dfd, name, LOOKUP_FOLLOW, &nd);
if (!error) { if (!error) {
error = vfs_getattr(nd.path.mnt, nd.path.dentry, stat); error = vfs_getattr(nd.path.mnt, nd.path.dentry, stat);
path_release(&nd); path_put(&nd.path);
} }
return error; return error;
} }
@ -83,7 +83,7 @@ int vfs_lstat_fd(int dfd, char __user *name, struct kstat *stat)
error = __user_walk_fd(dfd, name, 0, &nd); error = __user_walk_fd(dfd, name, 0, &nd);
if (!error) { if (!error) {
error = vfs_getattr(nd.path.mnt, nd.path.dentry, stat); error = vfs_getattr(nd.path.mnt, nd.path.dentry, stat);
path_release(&nd); path_put(&nd.path);
} }
return error; return error;
} }
@ -313,7 +313,7 @@ asmlinkage long sys_readlinkat(int dfd, const char __user *path,
buf, bufsiz); buf, bufsiz);
} }
} }
path_release(&nd); path_put(&nd.path);
} }
return error; return error;
} }

2
fs/utimes.c
Просмотреть файл

@ -138,7 +138,7 @@ dput_and_out:
if (f) if (f)
fput(f); fput(f);
else else
path_release(&nd); path_put(&nd.path);
out: out:
return error; return error;
} }

16
fs/xattr.c
Просмотреть файл

@ -263,7 +263,7 @@ sys_setxattr(char __user *path, char __user *name, void __user *value,
if (error) if (error)
return error; return error;
error = setxattr(nd.path.dentry, name, value, size, flags); error = setxattr(nd.path.dentry, name, value, size, flags);
path_release(&nd); path_put(&nd.path);
return error; return error;
} }
@ -278,7 +278,7 @@ sys_lsetxattr(char __user *path, char __user *name, void __user *value,
if (error) if (error)
return error; return error;
error = setxattr(nd.path.dentry, name, value, size, flags); error = setxattr(nd.path.dentry, name, value, size, flags);
path_release(&nd); path_put(&nd.path);
return error; return error;
} }
@ -348,7 +348,7 @@ sys_getxattr(char __user *path, char __user *name, void __user *value,
if (error) if (error)
return error; return error;
error = getxattr(nd.path.dentry, name, value, size); error = getxattr(nd.path.dentry, name, value, size);
path_release(&nd); path_put(&nd.path);
return error; return error;
} }
@ -363,7 +363,7 @@ sys_lgetxattr(char __user *path, char __user *name, void __user *value,
if (error) if (error)
return error; return error;
error = getxattr(nd.path.dentry, name, value, size); error = getxattr(nd.path.dentry, name, value, size);
path_release(&nd); path_put(&nd.path);
return error; return error;
} }
@ -422,7 +422,7 @@ sys_listxattr(char __user *path, char __user *list, size_t size)
if (error) if (error)
return error; return error;
error = listxattr(nd.path.dentry, list, size); error = listxattr(nd.path.dentry, list, size);
path_release(&nd); path_put(&nd.path);
return error; return error;
} }
@ -436,7 +436,7 @@ sys_llistxattr(char __user *path, char __user *list, size_t size)
if (error) if (error)
return error; return error;
error = listxattr(nd.path.dentry, list, size); error = listxattr(nd.path.dentry, list, size);
path_release(&nd); path_put(&nd.path);
return error; return error;
} }
@ -483,7 +483,7 @@ sys_removexattr(char __user *path, char __user *name)
if (error) if (error)
return error; return error;
error = removexattr(nd.path.dentry, name); error = removexattr(nd.path.dentry, name);
path_release(&nd); path_put(&nd.path);
return error; return error;
} }
@ -497,7 +497,7 @@ sys_lremovexattr(char __user *path, char __user *name)
if (error) if (error)
return error; return error;
error = removexattr(nd.path.dentry, name); error = removexattr(nd.path.dentry, name);
path_release(&nd); path_put(&nd.path);
return error; return error;
} }

2
fs/xfs/linux-2.6/xfs_ioctl.c
Просмотреть файл

@ -94,7 +94,7 @@ xfs_find_handle(
ASSERT(nd.path.dentry); ASSERT(nd.path.dentry);
ASSERT(nd.path.dentry->d_inode); ASSERT(nd.path.dentry->d_inode);
inode = igrab(nd.path.dentry->d_inode); inode = igrab(nd.path.dentry->d_inode);
path_release(&nd); path_put(&nd.path);
break; break;
} }

1
include/linux/namei.h
Просмотреть файл

@ -66,7 +66,6 @@ extern int __user_walk_fd(int dfd, const char __user *, unsigned, struct nameida
extern int path_lookup(const char *, unsigned, struct nameidata *); extern int path_lookup(const char *, unsigned, struct nameidata *);
extern int vfs_path_lookup(struct dentry *, struct vfsmount *, extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
const char *, unsigned int, struct nameidata *); const char *, unsigned int, struct nameidata *);
extern void path_release(struct nameidata *);
extern int __user_path_lookup_open(const char __user *, unsigned lookup_flags, struct nameidata *nd, int open_flags); extern int __user_path_lookup_open(const char __user *, unsigned lookup_flags, struct nameidata *nd, int open_flags);
extern int path_lookup_open(int dfd, const char *name, unsigned lookup_flags, struct nameidata *, int open_flags); extern int path_lookup_open(int dfd, const char *name, unsigned lookup_flags, struct nameidata *, int open_flags);

2
include/linux/path.h
Просмотреть файл

@ -9,4 +9,6 @@ struct path {
struct dentry *dentry; struct dentry *dentry;
}; };
extern void path_put(struct path *);
#endif /* _LINUX_PATH_H */ #endif /* _LINUX_PATH_H */

12
kernel/audit_tree.c
Просмотреть файл

@ -550,7 +550,7 @@ void audit_trim_trees(void)
goto skip_it; goto skip_it;
root_mnt = collect_mounts(nd.path.mnt, nd.path.dentry); root_mnt = collect_mounts(nd.path.mnt, nd.path.dentry);
path_release(&nd); path_put(&nd.path);
if (!root_mnt) if (!root_mnt)
goto skip_it; goto skip_it;
@ -642,7 +642,7 @@ int audit_add_tree_rule(struct audit_krule *rule)
if (err) if (err)
goto Err; goto Err;
mnt = collect_mounts(nd.path.mnt, nd.path.dentry); mnt = collect_mounts(nd.path.mnt, nd.path.dentry);
path_release(&nd); path_put(&nd.path);
if (!mnt) { if (!mnt) {
err = -ENOMEM; err = -ENOMEM;
goto Err; goto Err;
@ -702,7 +702,7 @@ int audit_tag_tree(char *old, char *new)
if (err) if (err)
return err; return err;
tagged = collect_mounts(nd.path.mnt, nd.path.dentry); tagged = collect_mounts(nd.path.mnt, nd.path.dentry);
path_release(&nd); path_put(&nd.path);
if (!tagged) if (!tagged)
return -ENOMEM; return -ENOMEM;
@ -713,7 +713,7 @@ int audit_tag_tree(char *old, char *new)
} }
mnt = mntget(nd.path.mnt); mnt = mntget(nd.path.mnt);
dentry = dget(nd.path.dentry); dentry = dget(nd.path.dentry);
path_release(&nd); path_put(&nd.path);
if (dentry == tagged->mnt_root && dentry == mnt->mnt_root) if (dentry == tagged->mnt_root && dentry == mnt->mnt_root)
follow_up(&mnt, &dentry); follow_up(&mnt, &dentry);
@ -744,13 +744,13 @@ int audit_tag_tree(char *old, char *new)
spin_lock(&vfsmount_lock); spin_lock(&vfsmount_lock);
if (!is_under(mnt, dentry, &nd)) { if (!is_under(mnt, dentry, &nd)) {
spin_unlock(&vfsmount_lock); spin_unlock(&vfsmount_lock);
path_release(&nd); path_put(&nd.path);
put_tree(tree); put_tree(tree);
mutex_lock(&audit_filter_mutex); mutex_lock(&audit_filter_mutex);
continue; continue;
} }
spin_unlock(&vfsmount_lock); spin_unlock(&vfsmount_lock);
path_release(&nd); path_put(&nd.path);
list_for_each_entry(p, &list, mnt_list) { list_for_each_entry(p, &list, mnt_list) {
failed = tag_chunk(p->mnt_root->d_inode, tree); failed = tag_chunk(p->mnt_root->d_inode, tree);

4
kernel/auditfilter.c
Просмотреть файл

@ -1161,11 +1161,11 @@ static int audit_get_nd(char *path, struct nameidata **ndp,
static void audit_put_nd(struct nameidata *ndp, struct nameidata *ndw) static void audit_put_nd(struct nameidata *ndp, struct nameidata *ndw)
{ {
if (ndp) { if (ndp) {
path_release(ndp); path_put(&ndp->path);
kfree(ndp); kfree(ndp);
} }
if (ndw) { if (ndw) {
path_release(ndw); path_put(&ndw->path);
kfree(ndw); kfree(ndw);
} }
} }

2
net/sunrpc/rpc_pipe.c
Просмотреть файл

@ -495,7 +495,7 @@ rpc_lookup_parent(char *path, struct nameidata *nd)
static void static void
rpc_release_path(struct nameidata *nd) rpc_release_path(struct nameidata *nd)
{ {
path_release(nd); path_put(&nd->path);
rpc_put_mount(); rpc_put_mount();
} }

6
net/unix/af_unix.c
Просмотреть файл

@ -727,7 +727,7 @@ static struct sock *unix_find_other(struct net *net,
if (u->sk_type == type) if (u->sk_type == type)
touch_atime(nd.path.mnt, nd.path.dentry); touch_atime(nd.path.mnt, nd.path.dentry);
path_release(&nd); path_put(&nd.path);
err=-EPROTOTYPE; err=-EPROTOTYPE;
if (u->sk_type != type) { if (u->sk_type != type) {
@ -748,7 +748,7 @@ static struct sock *unix_find_other(struct net *net,
return u; return u;
put_fail: put_fail:
path_release(&nd); path_put(&nd.path);
fail: fail:
*error=err; *error=err;
return NULL; return NULL;
@ -862,7 +862,7 @@ out_mknod_dput:
dput(dentry); dput(dentry);
out_mknod_unlock: out_mknod_unlock:
mutex_unlock(&nd.path.dentry->d_inode->i_mutex); mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
path_release(&nd); path_put(&nd.path);
out_mknod_parent: out_mknod_parent:
if (err==-EEXIST) if (err==-EEXIST)
err=-EADDRINUSE; err=-EADDRINUSE;