summaryrefslogtreecommitdiff
path: root/fs/namei.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-05-07 16:21:14 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2015-05-11 15:13:09 +0300
commit237d8b327abb428ff39b49e32ce07fdac468e32f (patch)
tree90c894d26adfaca1b17be26914daa9e65e174a9d /fs/namei.c
parent254cf582127b200ea6d4e55c9b4965485c3fe4c8 (diff)
downloadlinux-237d8b327abb428ff39b49e32ce07fdac468e32f.tar.xz
namei: store inode in nd->stack[]
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namei.c')
-rw-r--r--fs/namei.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/namei.c b/fs/namei.c
index e3214506016d..366b0f348d1c 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -507,6 +507,7 @@ struct nameidata {
struct path link;
void *cookie;
const char *name;
+ struct inode *inode;
} *stack, internal[EMBEDDED_LEVELS];
};
@@ -746,7 +747,7 @@ void nd_jump_link(struct path *path)
static inline void put_link(struct nameidata *nd)
{
struct saved *last = nd->stack + --nd->depth;
- struct inode *inode = last->link.dentry->d_inode;
+ struct inode *inode = last->inode;
if (last->cookie && inode->i_op->put_link)
inode->i_op->put_link(last->link.dentry, last->cookie);
path_put(&last->link);
@@ -779,7 +780,7 @@ static inline int may_follow_link(struct nameidata *nd)
return 0;
/* Allowed if owner and follower match. */
- inode = nd->stack[0].link.dentry->d_inode;
+ inode = nd->stack[0].inode;
if (uid_eq(current_cred()->fsuid, inode->i_uid))
return 0;
@@ -870,7 +871,7 @@ const char *get_link(struct nameidata *nd)
{
struct saved *last = nd->stack + nd->depth - 1;
struct dentry *dentry = last->link.dentry;
- struct inode *inode = dentry->d_inode;
+ struct inode *inode = last->inode;
int error;
const char *res;
@@ -1569,6 +1570,7 @@ static int pick_link(struct nameidata *nd, struct path *link, unsigned seq)
last = nd->stack + nd->depth++;
last->link = *link;
last->cookie = NULL;
+ last->inode = d_backing_inode(link->dentry);
return 1;
}