Commit 237d8b32 authored by Al Viro's avatar Al Viro

namei: store inode in nd->stack[]

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 254cf582
...@@ -507,6 +507,7 @@ struct nameidata { ...@@ -507,6 +507,7 @@ struct nameidata {
struct path link; struct path link;
void *cookie; void *cookie;
const char *name; const char *name;
struct inode *inode;
} *stack, internal[EMBEDDED_LEVELS]; } *stack, internal[EMBEDDED_LEVELS];
}; };
...@@ -746,7 +747,7 @@ void nd_jump_link(struct path *path) ...@@ -746,7 +747,7 @@ void nd_jump_link(struct path *path)
static inline void put_link(struct nameidata *nd) static inline void put_link(struct nameidata *nd)
{ {
struct saved *last = nd->stack + --nd->depth; 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) if (last->cookie && inode->i_op->put_link)
inode->i_op->put_link(last->link.dentry, last->cookie); inode->i_op->put_link(last->link.dentry, last->cookie);
path_put(&last->link); path_put(&last->link);
...@@ -779,7 +780,7 @@ static inline int may_follow_link(struct nameidata *nd) ...@@ -779,7 +780,7 @@ static inline int may_follow_link(struct nameidata *nd)
return 0; return 0;
/* Allowed if owner and follower match. */ /* 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)) if (uid_eq(current_cred()->fsuid, inode->i_uid))
return 0; return 0;
...@@ -870,7 +871,7 @@ const char *get_link(struct nameidata *nd) ...@@ -870,7 +871,7 @@ const char *get_link(struct nameidata *nd)
{ {
struct saved *last = nd->stack + nd->depth - 1; struct saved *last = nd->stack + nd->depth - 1;
struct dentry *dentry = last->link.dentry; struct dentry *dentry = last->link.dentry;
struct inode *inode = dentry->d_inode; struct inode *inode = last->inode;
int error; int error;
const char *res; const char *res;
...@@ -1569,6 +1570,7 @@ static int pick_link(struct nameidata *nd, struct path *link, unsigned seq) ...@@ -1569,6 +1570,7 @@ static int pick_link(struct nameidata *nd, struct path *link, unsigned seq)
last = nd->stack + nd->depth++; last = nd->stack + nd->depth++;
last->link = *link; last->link = *link;
last->cookie = NULL; last->cookie = NULL;
last->inode = d_backing_inode(link->dentry);
return 1; return 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment