Introduce path_put()
Subsystems (23)
PATCH 6/10 Introduce path_put()
From: Jan Blunck <[email protected]>
* 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()
[[email protected]: fix cifs]
Signed-off-by Jan Blunck <[email protected]>
Signed-off-by Andreas Gruenbacher <[email protected]>
Cc <[email protected]>
Cc Al Viro <[email protected]>
Cc Steven French <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/alpha/kernel/osf_sys.c | 2 arch/mips/kernel/sysirix.c | 6 - arch/parisc/hpux/sys_hpux.c | 2 arch/powerpc/platforms/cell/spufs/syscalls.c | 2 arch/sparc64/solaris/fs.c | 4 - drivers/md/dm-table.c | 2 drivers/mtd/mtdsuper.c | 4 - fs/afs/mntpt.c | 2 fs/autofs4/root.c | 2 fs/block_dev.c | 2 fs/cifs/cifs_dfs_ref.c | 2 fs/coda/pioctl.c | 4 - fs/compat.c | 4 - fs/configfs/symlink.c | 4 - fs/dquot.c | 2 fs/ecryptfs/main.c | 2 fs/exec.c | 4 - fs/ext3/super.c | 4 - fs/ext4/super.c | 4 - fs/gfs2/ops_fstype.c | 2 fs/inotify_user.c | 4 - fs/namei.c | 56 +++++++++-------- fs/namespace.c | 20 +++--- fs/nfs/namespace.c | 2 fs/nfsctl.c | 2 fs/nfsd/export.c | 10 +-- fs/nfsd/nfs4recover.c | 2 fs/nfsd/nfs4state.c | 2 fs/open.c | 22 +++--- fs/proc/base.c | 2 fs/reiserfs/super.c | 8 +- fs/stat.c | 6 - fs/utimes.c | 2 fs/xattr.c | 16 ++-- fs/xfs/linux-2.6/xfs_ioctl.c | 2 include/linux/namei.h | 1 include/linux/path.h | 2 kernel/audit_tree.c | 12 +-- kernel/auditfilter.c | 4 - net/sunrpc/rpc_pipe.c | 2 net/unix/af_unix.c | 6 - 41 files changed, 125 insertions(+), 118 deletions(-)
arch/alpha/kernel/osf_sys.c renamed from arch/alpha/kernel/osf_sys.c~introduce-path_put +1 -1
@@ -260,7 +260,7 @@ osf_statfs(char __user *path, struct osf retval =user_path_walk (path, &nd);if (!retval) { retval =do_osf_statfs (nd.path.dentry, buffer, bufsiz); -path_release (&nd); +path_put (&nd.path); }return retval; }
arch/mips/kernel/sysirix.c renamed from arch/mips/kernel/sysirix.c~introduce-path_put +3 -3
@@ -711,7 +711,7 @@ asmlinkage int irix_statfs(const char __ } dput_and_out: -path_release (&nd); +path_put (&nd.path); out:return error; }
@@ -1385,7 +1385,7 @@ asmlinkage int irix_statvfs(char __user error |=__put_user (0 , &buf->f_fstr[i]); dput_and_out: -path_release (&nd); +path_put (&nd.path); out:return error; }
@@ -1636,7 +1636,7 @@ asmlinkage int irix_statvfs64(char __use error |=__put_user (0 , &buf->f_fstr[i]); dput_and_out: -path_release (&nd); +path_put (&nd.path); out:return error; }
arch/parisc/hpux/sys_hpux.c renamed from arch/parisc/hpux/sys_hpux.c~introduce-path_put +1 -1
@@ -222,7 +222,7 @@ asmlinkage long hpux_statfs(const char _ error =vfs_statfs_hpux (nd.path.dentry, &tmp);if (!error &©_to_user (buf, &tmp,sizeof (tmp))) error = -EFAULT ; -path_release (&nd); +path_put (&nd.path); }return error; }
arch/powerpc/platforms/cell/spufs/syscalls.c renamed from arch/powerpc/platforms/cell/spufs/syscalls.c~introduce-path_put +1 -1
@@ -73,7 +73,7 @@ static long do_spu_create(const char __u LOOKUP_OPEN|LOOKUP_CREATE, &nd);if (!ret) { ret =spufs_create (&nd, flags, mode, neighbor); -path_release (&nd); +path_put (&nd.path); }putname (tmp); }
arch/sparc64/solaris/fs.c renamed from arch/sparc64/solaris/fs.c~introduce-path_put +2 -2
@@ -436,7 +436,7 @@ asmlinkage int solaris_statvfs(u32 path,if (!error) {struct inode *inode = nd.path.dentry->d_inode; error =report_statvfs (nd.path.mnt, inode, buf); -path_release (&nd); +path_put (&nd.path); }return error; }
@@ -466,7 +466,7 @@ asmlinkage int solaris_statvfs64(u32 patif (!error) {struct inode *inode = nd.path.dentry->d_inode; error =report_statvfs64 (nd.path.mnt, inode, buf); -path_release (&nd); +path_put (&nd.path); }unlock_kernel ();return error;
drivers/md/dm-table.c renamed from drivers/md/dm-table.c~introduce-path_put +1 -1
@@ -375,7 +375,7 @@ static int lookup_device(const char *pat *dev = inode->i_rdev; out: -path_release (&nd); +path_put (&nd.path);return r; }
drivers/mtd/mtdsuper.c renamed from drivers/mtd/mtdsuper.c~introduce-path_put +2 -2
@@ -203,7 +203,7 @@ int get_sb_mtd(struct file_system_type * goto not_an_MTD_device; 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, mnt);
@@ -214,7 +214,7 @@ not_an_MTD_device:"MTD: Attempt to mount non-MTD device \"%s\"\n" , dev_name); out: -path_release (&nd); +path_put (&nd.path);return ret; }
fs/afs/mntpt.c renamed from fs/afs/mntpt.c~introduce-path_put +1 -1
@@ -227,7 +227,7 @@ static void *afs_mntpt_follow_link(struc newmnt =afs_mntpt_do_automount (nd->path.dentry);if (IS_ERR (newmnt)) { -path_release (nd); +path_put (&nd->path);return (void *)newmnt; }
fs/autofs4/root.c renamed from fs/autofs4/root.c~introduce-path_put +1 -1
@@ -383,7 +383,7 @@ done:return NULL ; out_error: -path_release (nd); +path_put (&nd->path);return ERR_PTR (status); }
fs/block_dev.c renamed from fs/block_dev.c~introduce-path_put +1 -1
@@ -1409,7 +1409,7 @@ struct block_device *lookup_bdev(const cif (!bdev) goto fail; out: -path_release (&nd); +path_put (&nd.path);return bdev; fail: bdev =ERR_PTR (error);
fs/cifs/cifs_dfs_ref.c renamed from fs/cifs/cifs_dfs_ref.c~introduce-path_put +1 -1
@@ -368,7 +368,7 @@ out:cFYI (1 , ("leaving %s" , __FUNCTION__));return ERR_PTR (rc); out_err: -path_release (nd); +path_put (&nd->path); goto out; }
fs/coda/pioctl.c renamed from fs/coda/pioctl.c~introduce-path_put +2 -2
@@ -80,7 +80,7 @@ static int coda_pioctl(struct inode * in/* return if it is not a Coda inode */ if ( target_inode->i_sb != inode->i_sb ) { -path_release (&nd); +path_put (&nd.path);return -EINVAL ; }
@@ -89,7 +89,7 @@ static int coda_pioctl(struct inode * in error =venus_pioctl (inode->i_sb, &(cnp->c_fid), cmd, &data); -path_release (&nd); +path_put (&nd.path);return error; }
fs/compat.c renamed from fs/compat.c~introduce-path_put +2 -2
@@ -244,7 +244,7 @@ asmlinkage long compat_sys_statfs(const error =vfs_statfs (nd.path.dentry, &tmp);if (!error) error =put_compat_statfs (buf, &tmp); -path_release (&nd); +path_put (&nd.path); }return error; }
@@ -312,7 +312,7 @@ asmlinkage long compat_sys_statfs64(cons error =vfs_statfs (nd.path.dentry, &tmp);if (!error) error =put_compat_statfs64 (buf, &tmp); -path_release (&nd); +path_put (&nd.path); }return error; }
fs/configfs/symlink.c renamed from fs/configfs/symlink.c~introduce-path_put +2 -2
@@ -103,7 +103,7 @@ static int get_target(const char *symnam *target =configfs_get_config_item (nd->path.dentry);if (!*target) { ret = -ENOENT ; -path_release (nd); +path_put (&nd->path); } }else ret = -EPERM ;
@@ -141,7 +141,7 @@ int configfs_symlink(struct inode *dir, ret =create_link (parent_item, target_item, dentry);config_item_put (target_item); -path_release (&nd); +path_put (&nd.path); out_put:config_item_put (parent_item);
fs/dquot.c renamed from fs/dquot.c~introduce-path_put +1 -1
@@ -1643,7 +1643,7 @@ int vfs_quota_on(struct super_block *sb, error =vfs_quota_on_inode (nd.path.dentry->d_inode, type, format_id); out_path: -path_release (&nd); +path_put (&nd.path);return error; }
fs/ecryptfs/main.c renamed from fs/ecryptfs/main.c~introduce-path_put +1 -1
@@ -526,7 +526,7 @@ static int ecryptfs_read_super(struct su rc =0 ; goto out; out_free: -path_release (&nd); +path_put (&nd.path); out:return rc; }
fs/exec.c renamed from fs/exec.c~introduce-path_put +2 -2
@@ -148,7 +148,7 @@ out:return error; exit:release_open_intent (&nd); -path_release (&nd); +path_put (&nd.path); goto out; }
@@ -672,7 +672,7 @@ out: } }release_open_intent (&nd); -path_release (&nd); +path_put (&nd.path); } goto out; }
fs/ext3/super.c renamed from fs/ext3/super.c~introduce-path_put +2 -2
@@ -2759,7 +2759,7 @@ static int ext3_quota_on(struct super_blreturn err;/* Quotafile not on the same filesystem? */ if (nd.path.mnt->mnt_sb != sb) { -path_release (&nd); +path_put (&nd.path);return -EXDEV ; }/* Quotafile not of fs root? */
@@ -2767,7 +2767,7 @@ static int ext3_quota_on(struct super_blprintk (KERN_WARNING "EXT3-fs: Quota file not on filesystem root. " "Journalled quota will not work.\n" ); -path_release (&nd); +path_put (&nd.path);return vfs_quota_on (sb, type, format_id, path); }
fs/ext4/super.c renamed from fs/ext4/super.c~introduce-path_put +2 -2
@@ -3159,7 +3159,7 @@ static int ext4_quota_on(struct super_blreturn err;/* Quotafile not on the same filesystem? */ if (nd.path.mnt->mnt_sb != sb) { -path_release (&nd); +path_put (&nd.path);return -EXDEV ; }/* Quotafile not of fs root? */
@@ -3167,7 +3167,7 @@ static int ext4_quota_on(struct super_blprintk (KERN_WARNING "EXT4-fs: Quota file not on filesystem root. " "Journalled quota will not work.\n" ); -path_release (&nd); +path_put (&nd.path);return vfs_quota_on (sb, type, format_id, path); }
fs/gfs2/ops_fstype.c renamed from fs/gfs2/ops_fstype.c~introduce-path_put +1 -1
@@ -900,7 +900,7 @@ static struct super_block* get_gfs2_sb(c "mount point %s\n", dev_name); free_nd: -path_release (&nd); +path_put (&nd.path); out:return sb; }
fs/inotify_user.c renamed from fs/inotify_user.c~introduce-path_put +2 -2
@@ -367,7 +367,7 @@ static int find_inode(const char __user/* you can only watch an inode if you have read permissions on it */ error =vfs_permission (nd,MAY_READ );if (error) -path_release (nd); +path_put (&nd->path);return error; }
@@ -676,7 +676,7 @@ asmlinkage long sys_inotify_add_watch(in ret =create_watch (dev, inode, mask);mutex_unlock (&dev->up_mutex); -path_release (&nd); +path_put (&nd.path); fput_and_out:fput_light (filp, fput_needed);return ret;
fs/namei.c renamed from fs/namei.c~introduce-path_put +31 -25
170 lines not on this page · raw message
fs/namespace.c renamed from fs/namespace.c~introduce-path_put +10 -10
@@ -1007,7 +1007,7 @@ static noinline int do_loopback(struct n out:up_write (&namespace_sem); -path_release (&old_nd); +path_put (&old_nd.path);return err; }
@@ -1126,8 +1126,8 @@ out1: out:up_write (&namespace_sem);if (!err) -path_release (&parent_nd); -path_release (&old_nd); +path_put (&parent_nd.path); +path_put (&old_nd.path);return err; }
@@ -1512,7 +1512,7 @@ long do_mount(char *dev_name, char *dir_ retval =do_new_mount (&nd, type_page, flags, mnt_flags, dev_name, data_page); dput_out: -path_release (&nd); +path_put (&nd.path);return retval; }
@@ -1768,7 +1768,7 @@ asmlinkage long sys_pivot_root(const cha error =security_sb_pivotroot (&old_nd, &new_nd);if (error) { -path_release (&old_nd); +path_put (&old_nd.path); goto out1; }
@@ -1831,15 +1831,15 @@ asmlinkage long sys_pivot_root(const chachroot_fs_refs (&user_nd, &new_nd);security_sb_post_pivotroot (&user_nd, &new_nd); error =0 ; -path_release (&root_parent); -path_release (&parent_nd); +path_put (&root_parent.path); +path_put (&parent_nd.path); out2:mutex_unlock (&old_nd.path.dentry->d_inode->i_mutex);up_write (&namespace_sem); -path_release (&user_nd); -path_release (&old_nd); +path_put (&user_nd.path); +path_put (&old_nd.path); out1: -path_release (&new_nd); +path_put (&new_nd.path); out0:unlock_kernel ();return error;
fs/nfs/namespace.c renamed from fs/nfs/namespace.c~introduce-path_put +1 -1
@@ -148,7 +148,7 @@ out:dprintk ("<-- nfs_follow_mountpoint() = %d\n" , err);return ERR_PTR (err); out_err: -path_release (nd); +path_put (&nd->path); goto out; out_follow: while (d_mountpoint(nd->path.dentry) &&
fs/nfsctl.c renamed from fs/nfsctl.c~introduce-path_put +1 -1
@@ -43,7 +43,7 @@ static struct file *do_open(char *name,if (!error)return dentry_open (nd.path.dentry, nd.path.mnt, flags); -path_release (&nd); +path_put (&nd.path);return ERR_PTR (error); }
fs/nfsd/export.c renamed from fs/nfsd/export.c~introduce-path_put +5 -5
@@ -177,7 +177,7 @@ static int expkey_parse(struct cache_detcache_put (&ek->h, &svc_expkey_cache); else err = -ENOMEM ; -path_release (&nd); +path_put (&nd.path); }cache_flush (); out:
@@ -630,7 +630,7 @@ static int svc_export_parse(struct cachekfree (exp.ex_uuid);kfree (exp.ex_path);if (nd.path.dentry) -path_release (&nd); +path_put (&nd.path); out_no_path:if (dom)auth_domain_put (dom);
@@ -1098,7 +1098,7 @@ finish:cache_put (&fsid_key->h, &svc_expkey_cache);if (clp)auth_domain_put (clp); -path_release (&nd); +path_put (&nd.path); out_unlock:exp_writeunlock (); out:
@@ -1150,7 +1150,7 @@ exp_unexport(struct nfsctl_export *nxp) err = -EINVAL ; exp =exp_get_by_name (dom, nd.path.mnt, nd.path.dentry,NULL ); -path_release (&nd); +path_put (&nd.path);if (IS_ERR (exp)) goto out_domain;
@@ -1209,7 +1209,7 @@ exp_rootfh(svc_client *clp, char *path,fh_put (&fh);exp_put (exp); out: -path_release (&nd); +path_put (&nd.path);return err; }
fs/nfsd/nfs4recover.c renamed from fs/nfsd/nfs4recover.c~introduce-path_put +1 -1
@@ -415,5 +415,5 @@ nfsd4_shutdown_recdir(void)if (!rec_dir_init)return ; rec_dir_init =0 ; -path_release (&rec_dir); +path_put (&rec_dir.path); }
fs/nfsd/nfs4state.c renamed from fs/nfsd/nfs4state.c~introduce-path_put +1 -1
@@ -3265,7 +3265,7 @@ nfs4_reset_recoverydir(char *recdir)nfs4_set_recdir (recdir); status =0 ; } -path_release (&nd); +path_put (&nd.path);return status; }
fs/open.c renamed from fs/open.c~introduce-path_put +11 -11
@@ -130,7 +130,7 @@ asmlinkage long sys_statfs(const char __ error =vfs_statfs_native (nd.path.dentry, &tmp);if (!error &©_to_user (buf, &tmp,sizeof (tmp))) error = -EFAULT ; -path_release (&nd); +path_put (&nd.path); }return error; }
@@ -149,7 +149,7 @@ asmlinkage long sys_statfs64(const char error =vfs_statfs64 (nd.path.dentry, &tmp);if (!error &©_to_user (buf, &tmp,sizeof (tmp))) error = -EFAULT ; -path_release (&nd); +path_put (&nd.path); }return error; }
@@ -277,7 +277,7 @@ static long do_sys_truncate(const char _ put_write_and_out:put_write_access (inode); dput_and_out: -path_release (&nd); +path_put (&nd.path); out:return error; }
@@ -462,7 +462,7 @@ asmlinkage long sys_faccessat(int dfd, c res = -EROFS ; out_path_release: -path_release (&nd); +path_put (&nd.path); out: current->fsuid = old_fsuid; current->fsgid = old_fsgid;
@@ -493,7 +493,7 @@ asmlinkage long sys_chdir(const char __uset_fs_pwd (current->fs, nd.path.mnt, nd.path.dentry); dput_and_out: -path_release (&nd); +path_put (&nd.path); out:return error; }
@@ -549,7 +549,7 @@ asmlinkage long sys_chroot(const char __set_fs_altroot (); error =0 ; dput_and_out: -path_release (&nd); +path_put (&nd.path); out:return error; }
@@ -621,7 +621,7 @@ asmlinkage long sys_fchmodat(int dfd, comutex_unlock (&inode->i_mutex); dput_and_out: -path_release (&nd); +path_put (&nd.path); out:return error; }
@@ -676,7 +676,7 @@ asmlinkage long sys_chown(const char __uif (error) goto out; error =chown_common (nd.path.dentry, user, group); -path_release (&nd); +path_put (&nd.path); out:return error; }
@@ -696,7 +696,7 @@ asmlinkage long sys_fchownat(int dfd, coif (error) goto out; error =chown_common (nd.path.dentry, user, group); -path_release (&nd); +path_put (&nd.path); out:return error; }
@@ -710,7 +710,7 @@ asmlinkage long sys_lchown(const char __if (error) goto out; error =chown_common (nd.path.dentry, user, group); -path_release (&nd); +path_put (&nd.path); out:return error; }
@@ -894,7 +894,7 @@ struct file *nameidata_to_filp(struct na filp =__dentry_open (nd->path.dentry, nd->path.mnt, flags, filp,NULL ); else -path_release (nd ); + path_put(&nd->path);return filp; }
fs/proc/base.c renamed from fs/proc/base.c~introduce-path_put +1 -1
@@ -1164,7 +1164,7 @@ static void *proc_pid_follow_link(structint error = -EACCES ;/* 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? */ if (!proc_fd_access_allowed (inode))
fs/reiserfs/super.c renamed from fs/reiserfs/super.c~introduce-path_put +4 -4
@@ -2027,20 +2027,20 @@ static int reiserfs_quota_on(struct supereturn err;/* Quotafile not on the same filesystem? */ if (nd.path.mnt->mnt_sb != sb) { -path_release (&nd); +path_put (&nd.path);return -EXDEV ; }/* 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) {reiserfs_warning (sb,"reiserfs: Quota file must have tail packing disabled." ); -path_release (&nd); +path_put (&nd.path);return -EINVAL ; }/* Not journalling quota? No more tests needed... */ if (!REISERFS_SB (sb)->s_qf_names[USRQUOTA ] && !REISERFS_SB (sb)->s_qf_names[GRPQUOTA ]) { -path_release (&nd); +path_put (&nd.path);return vfs_quota_on (sb, type, format_id, path); }/* Quotafile not of fs root? */
@@ -2048,7 +2048,7 @@ static int reiserfs_quota_on(struct supereiserfs_warning (sb,"reiserfs: Quota file not on filesystem root. " "Journalled quota will not work." ); -path_release (&nd); +path_put (&nd.path);return vfs_quota_on (sb, type, format_id, path); }
fs/stat.c renamed from fs/stat.c~introduce-path_put +3 -3
@@ -63,7 +63,7 @@ int vfs_stat_fd(int dfd, char __user *na error =__user_walk_fd (dfd, name,LOOKUP_FOLLOW , &nd);if (!error) { error =vfs_getattr (nd.path.mnt, nd.path.dentry, stat); -path_release (&nd); +path_put (&nd.path); }return error; }
@@ -83,7 +83,7 @@ int vfs_lstat_fd(int dfd, char __user *n error =__user_walk_fd (dfd, name,0 , &nd);if (!error) { error =vfs_getattr (nd.path.mnt, nd.path.dentry, stat); -path_release (&nd); +path_put (&nd.path); }return error; }
@@ -313,7 +313,7 @@ asmlinkage long sys_readlinkat(int dfd, buf, bufsiz); } } -path_release (&nd); +path_put (&nd.path); }return error; }
fs/utimes.c renamed from fs/utimes.c~introduce-path_put +1 -1
@@ -138,7 +138,7 @@ dput_and_out:if (f)fput (f);else -path_release (&nd); +path_put (&nd.path); out:return error; }
fs/xattr.c renamed from fs/xattr.c~introduce-path_put +8 -8
@@ -263,7 +263,7 @@ sys_setxattr(char __user *path, char __uif (error)return error; error =setxattr (nd.path.dentry, name, value, size, flags); -path_release (&nd); +path_put (&nd.path);return error; }
@@ -278,7 +278,7 @@ sys_lsetxattr(char __user *path, char __if (error)return error; error =setxattr (nd.path.dentry, name, value, size, flags); -path_release (&nd); +path_put (&nd.path);return error; }
@@ -348,7 +348,7 @@ sys_getxattr(char __user *path, char __uif (error)return error; error =getxattr (nd.path.dentry, name, value, size); -path_release (&nd); +path_put (&nd.path);return error; }
@@ -363,7 +363,7 @@ sys_lgetxattr(char __user *path, char __if (error)return error; error =getxattr (nd.path.dentry, name, value, size); -path_release (&nd); +path_put (&nd.path);return error; }
@@ -422,7 +422,7 @@ sys_listxattr(char __user *path, char __if (error)return error; error =listxattr (nd.path.dentry, list, size); -path_release (&nd); +path_put (&nd.path);return error; }
@@ -436,7 +436,7 @@ sys_llistxattr(char __user *path, char _if (error)return error; error =listxattr (nd.path.dentry, list, size); -path_release (&nd); +path_put (&nd.path);return error; }
@@ -483,7 +483,7 @@ sys_removexattr(char __user *path, charif (error)return error; error =removexattr (nd.path.dentry, name); -path_release (&nd); +path_put (&nd.path);return error; }
@@ -497,7 +497,7 @@ sys_lremovexattr(char __user *path, charif (error)return error; error =removexattr (nd.path.dentry, name); -path_release (&nd); +path_put (&nd.path);return error; }
fs/xfs/linux-2.6/xfs_ioctl.c renamed from fs/xfs/linux-2.6/xfs_ioctl.c~introduce-path_put +1 -1
@@ -94,7 +94,7 @@ xfs_find_handle(ASSERT (nd.path.dentry);ASSERT (nd.path.dentry->d_inode); inode =igrab (nd.path.dentry->d_inode); -path_release (&nd); +path_put (&nd.path);break ; }
include/linux/namei.h renamed from include/linux/namei.h~introduce-path_put +0 -1
@@ -66,7 +66,6 @@ extern int __user_walk_fd(int dfd, constextern int path_lookup (const char *,unsigned ,struct nameidata *);extern int vfs_path_lookup (struct dentry *,struct vfsmount *,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 path_lookup_open (int dfd,const char *name,unsigned lookup_flags,struct nameidata *,int open_flags);
include/linux/path.h renamed from include/linux/path.h~introduce-path_put +2 -0
@@ -9,4 +9,6 @@ struct path { struct dentry *dentry; }; +extern void path_put (struct path *); +#endif /* _LINUX_PATH_H */
kernel/audit_tree.c renamed from kernel/audit_tree.c~introduce-path_put +6 -6
@@ -550,7 +550,7 @@ void audit_trim_trees(void) goto skip_it; root_mnt =collect_mounts (nd.path.mnt, nd.path.dentry); -path_release (&nd); +path_put (&nd.path);if (!root_mnt) goto skip_it;
@@ -642,7 +642,7 @@ int audit_add_tree_rule(struct audit_kruif (err) goto Err; mnt =collect_mounts (nd.path.mnt, nd.path.dentry); -path_release (&nd); +path_put (&nd.path);if (!mnt) { err = -ENOMEM ; goto Err;
@@ -702,7 +702,7 @@ int audit_tag_tree(char *old, char *new)if (err)return err; tagged =collect_mounts (nd.path.mnt, nd.path.dentry); -path_release (&nd); +path_put (&nd.path);if (!tagged)return -ENOMEM ;
@@ -713,7 +713,7 @@ int audit_tag_tree(char *old, char *new) } mnt =mntget (nd.path.mnt); dentry =dget (nd.path.dentry); -path_release (&nd); +path_put (&nd.path);if (dentry == tagged->mnt_root && dentry == mnt->mnt_root)follow_up (&mnt, &dentry);
@@ -744,13 +744,13 @@ int audit_tag_tree(char *old, char *new)spin_lock (&vfsmount_lock);if (!is_under (mnt, dentry, &nd)) {spin_unlock (&vfsmount_lock); -path_release (&nd); +path_put (&nd.path);put_tree (tree);mutex_lock (&audit_filter_mutex);continue ; }spin_unlock (&vfsmount_lock); -path_release (&nd); +path_put (&nd.path);list_for_each_entry (p, &list, mnt_list) { failed =tag_chunk (p->mnt_root->d_inode, tree);
kernel/auditfilter.c renamed from kernel/auditfilter.c~introduce-path_put +2 -2
@@ -1161,11 +1161,11 @@ static int audit_get_nd(char *path, strustatic void audit_put_nd (struct nameidata *ndp,struct nameidata *ndw) {if (ndp) { -path_release (ndp); +path_put (&ndp->path);kfree (ndp); }if (ndw) { -path_release (ndw); +path_put (&ndw->path);kfree (ndw); } }
net/sunrpc/rpc_pipe.c renamed from net/sunrpc/rpc_pipe.c~introduce-path_put +1 -1
@@ -495,7 +495,7 @@ rpc_lookup_parent(char *path, struct namstatic void rpc_release_path (struct nameidata *nd) { -path_release (nd); +path_put (&nd->path);rpc_put_mount (); }
net/unix/af_unix.c renamed from net/unix/af_unix.c~introduce-path_put +3 -3
@@ -727,7 +727,7 @@ static struct sock *unix_find_other(struif (u->sk_type == type)touch_atime (nd.path.mnt, nd.path.dentry); -path_release (&nd); +path_put (&nd.path); err=-EPROTOTYPE ;if (u->sk_type != type) {
@@ -748,7 +748,7 @@ static struct sock *unix_find_other(strureturn u; put_fail: -path_release (&nd); +path_put (&nd.path); fail: *error=err;return NULL ;
@@ -862,7 +862,7 @@ out_mknod_dput:dput (dentry); out_mknod_unlock:mutex_unlock (&nd.path.dentry->d_inode->i_mutex); -path_release (&nd); +path_put (&nd.path); out_mknod_parent:if (err==-EEXIST ) err=-EADDRINUSE ;
_