Home » Mailing list archives » linux-kernel » 2007 » October » 22

[PATCH 03/13] Remove path_release_on_umount()

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Bharata B Rao <bharata@...>
To: Andrew Morton <akpm@...>
Cc: Jan Blunck <jblunck@...>, Andreas Gruenbacher <agruen@...>, Christoph Hellwig <hch@...>, <viro@...>, <linux-kernel@...>
Subject: [PATCH 03/13] Remove path_release_on_umount()
Date: Monday, October 22, 2007 - 2:56 am

From: Jan Blunck <jblunck@suse.de>

path_release_on_umount() should only be called from sys_umount(). I merged the
function into sys_umount() instead of having in in namei.c.

Signed-off-by: Jan Blunck <jblunck@suse.de>
Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
Acked-by: Christoph Hellwig <hch@lst.de>
---
 fs/namei.c            |   10 ----------
 fs/namespace.c        |    4 +++-
 include/linux/namei.h |    1 -
 3 files changed, 3 insertions(+), 12 deletions(-)

--- a/fs/namei.c
+++ b/fs/namei.c
@@ -368,16 +368,6 @@ void path_release(struct nameidata *nd)
 	mntput(nd->mnt);
 }
 
-/*
- * umount() mustn't call path_release()/mntput() as that would clear
- * mnt_expiry_mark
- */
-void path_release_on_umount(struct nameidata *nd)
-{
-	dput(nd->dentry);
-	mntput_no_expire(nd->mnt);
-}
-
 /**
  * release_open_intent - free up open intent resources
  * @nd: pointer to nameidata
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -988,7 +988,9 @@ asmlinkage long sys_umount(char __user *
 
 	retval = do_umount(nd.mnt, flags);
 dput_and_out:
-	path_release_on_umount(&nd);
+	/* we mustn't call path_put() as that would clear mnt_expiry_mark */
+	dput(nd.dentry);
+	mntput_no_expire(nd.mnt);
 out:
 	return retval;
 }
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -73,7 +73,6 @@ extern int FASTCALL(path_lookup(const ch
 extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
 			   const char *, unsigned int, struct nameidata *);
 extern void path_release(struct nameidata *);
-extern void path_release_on_umount(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);
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 00/13] Use struct path in struct nameidata, Bharata B Rao, (Mon Oct 22, 2:53 am)
Re: [PATCH 00/13] Use struct path in struct nameidata, Christoph Hellwig, (Mon Oct 22, 9:57 am)
Re: [PATCH 00/13] Use struct path in struct nameidata, Bharata B Rao, (Mon Oct 22, 10:33 pm)
Re: [PATCH 00/13] Use struct path in struct nameidata, Jan Blunck, (Tue Oct 23, 4:43 am)
Re: [PATCH 00/13] Use struct path in struct nameidata, Bharata B Rao, (Tue Oct 23, 11:31 pm)
Re: [PATCH 00/13] Use struct path in struct nameidata, Andrew Morton, (Mon Oct 22, 6:56 pm)
Re: [PATCH 00/13] Use struct path in struct nameidata, Jan Blunck, (Tue Oct 23, 4:39 am)
[PATCH 13/13] Rename {__}d_path() to {__}print_path() and fi..., Bharata B Rao, (Mon Oct 22, 3:04 am)
Re: [PATCH 13/13] Rename {__}d_path() to {__}print_path() an..., Christoph Hellwig, (Mon Oct 22, 6:14 am)
Re: [PATCH 13/13] Rename {__}d_path() to {__}print_path() an..., Andrew Morton, (Mon Oct 22, 6:56 pm)
[PATCH 12/13] Use struct path argument in proc_get_link(), Bharata B Rao, (Mon Oct 22, 3:03 am)
[PATCH 11/13] Make __d_path() to take a struct path argument, Bharata B Rao, (Mon Oct 22, 3:02 am)
[PATCH 10/13] Make set_fs_{root,pwd} take a struct path, Bharata B Rao, (Mon Oct 22, 3:02 am)
[PATCH 09/13] Use struct path in fs_struct, Bharata B Rao, (Mon Oct 22, 3:01 am)
[PATCH 08/13] Introduce path_get(), Bharata B Rao, (Mon Oct 22, 3:00 am)
[PATCH 07/13] Use path_put() in a few places instead of {mnt..., Bharata B Rao, (Mon Oct 22, 2:59 am)
[PATCH 05/13] Embed a struct path into struct nameidata inst..., Bharata B Rao, (Mon Oct 22, 2:58 am)
[PATCH 06/13] Introduce path_put(), Bharata B Rao, (Mon Oct 22, 2:59 am)
[PATCH 04/13] Move struct path into its own header, Bharata B Rao, (Mon Oct 22, 2:57 am)
[PATCH 03/13] Remove path_release_on_umount(), Bharata B Rao, (Mon Oct 22, 2:56 am)
[PATCH 02/13] Don't touch fs_struct in usermodehelper, Bharata B Rao, (Mon Oct 22, 2:55 am)
[PATCH 01/13] Don't touch fs_struct in drivers, Bharata B Rao, (Mon Oct 22, 2:54 am)