get rid of nd->file
Don't stash the struct file * used as starting point of walk in nameidata;
pass file ** to path_init() instead.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/fs/namei.c b/fs/namei.c
index 85f6e39..a260a30 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1498,7 +1498,8 @@
return err;
}
-static int path_init(int dfd, const char *name, unsigned int flags, struct nameidata *nd)
+static int path_init(int dfd, const char *name, unsigned int flags,
+ struct nameidata *nd, struct file **fp)
{
int retval = 0;
int fput_needed;
@@ -1508,7 +1509,6 @@
nd->flags = flags | LOOKUP_JUMPED;
nd->depth = 0;
nd->root.mnt = NULL;
- nd->file = NULL;
if (*name=='/') {
if (flags & LOOKUP_RCU) {
@@ -1557,7 +1557,7 @@
nd->path = file->f_path;
if (flags & LOOKUP_RCU) {
if (fput_needed)
- nd->file = file;
+ *fp = file;
nd->seq = __read_seqcount_begin(&nd->path.dentry->d_seq);
br_read_lock(vfsmount_lock);
rcu_read_lock();
@@ -1580,6 +1580,7 @@
static int path_lookupat(int dfd, const char *name,
unsigned int flags, struct nameidata *nd)
{
+ struct file *base = NULL;
int retval;
/*
@@ -1596,7 +1597,7 @@
* be handled by restarting a traditional ref-walk (which will always
* be able to complete).
*/
- retval = path_init(dfd, name, flags, nd);
+ retval = path_init(dfd, name, flags, nd, &base);
if (unlikely(retval))
return retval;
@@ -1614,10 +1615,8 @@
if (!retval)
retval = handle_reval_path(nd);
- if (nd->file) {
- fput(nd->file);
- nd->file = NULL;
- }
+ if (base)
+ fput(base);
if (nd->root.mnt) {
path_put(&nd->root);