From: Bharata B Rao <bharata@linux.vnet.ibm.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Jan Blunck <jblunck@suse.de>,
Andreas Gruenbacher <agruen@suse.de>,
Christoph Hellwig <hch@lst.de>,
viro@zeniv.linux.org.uk, linux-kernel@vger.kernel.org
Subject: [PATCH 03/13] Remove path_release_on_umount()
Date: Mon, 22 Oct 2007 12:26:32 +0530 [thread overview]
Message-ID: <20071022065632.GD6489@in.ibm.com> (raw)
In-Reply-To: <20071022065352.GA6489@in.ibm.com>
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);
next prev parent reply other threads:[~2007-10-22 6:56 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-22 6:53 [PATCH 00/13] Use struct path in struct nameidata Bharata B Rao
2007-10-22 6:54 ` [PATCH 01/13] Don't touch fs_struct in drivers Bharata B Rao
2007-10-22 6:55 ` [PATCH 02/13] Don't touch fs_struct in usermodehelper Bharata B Rao
2007-10-22 6:56 ` Bharata B Rao [this message]
2007-10-22 6:57 ` [PATCH 04/13] Move struct path into its own header Bharata B Rao
2007-10-22 6:58 ` [PATCH 05/13] Embed a struct path into struct nameidata instead of nd->{dentry,mnt} Bharata B Rao
2007-10-22 6:59 ` [PATCH 06/13] Introduce path_put() Bharata B Rao
2007-10-22 6:59 ` [PATCH 07/13] Use path_put() in a few places instead of {mnt,d}put() Bharata B Rao
2007-10-22 7:00 ` [PATCH 08/13] Introduce path_get() Bharata B Rao
2007-10-22 7:01 ` [PATCH 09/13] Use struct path in fs_struct Bharata B Rao
2007-10-22 7:02 ` [PATCH 10/13] Make set_fs_{root,pwd} take a struct path Bharata B Rao
2007-10-22 7:02 ` [PATCH 11/13] Make __d_path() to take a struct path argument Bharata B Rao
2007-10-22 7:03 ` [PATCH 12/13] Use struct path argument in proc_get_link() Bharata B Rao
2007-10-22 7:04 ` [PATCH 13/13] Rename {__}d_path() to {__}print_path() and fix comments Bharata B Rao
2007-10-22 10:14 ` Christoph Hellwig
2007-10-22 22:56 ` Andrew Morton
2007-10-22 13:57 ` [PATCH 00/13] Use struct path in struct nameidata Christoph Hellwig
2007-10-22 22:56 ` Andrew Morton
2007-10-23 8:39 ` Jan Blunck
2007-10-23 2:33 ` Bharata B Rao
2007-10-23 8:43 ` Jan Blunck
2007-10-24 3:31 ` Bharata B Rao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071022065632.GD6489@in.ibm.com \
--to=bharata@linux.vnet.ibm.com \
--cc=agruen@suse.de \
--cc=akpm@linux-foundation.org \
--cc=hch@lst.de \
--cc=jblunck@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox