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:

committed by
Linus Torvalds

parent
4ac9137858
commit
1d957f9bf8
@@ -2027,20 +2027,20 @@ static int reiserfs_quota_on(struct super_block *sb, int type, int format_id,
|
||||
return 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 super_block *sb, int type, int format_id,
|
||||
reiserfs_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);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user