Commit acda4721 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'vfs-scale-working' of...

Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin

* 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin:
  kernel: fix hlist_bl again
  cgroups: Fix a lockdep warning at cgroup removal
  fs: namei fix ->put_link on wrong inode in do_filp_open
parents 822e5215 32385c7c
...@@ -779,7 +779,8 @@ static void path_put_conditional(struct path *path, struct nameidata *nd) ...@@ -779,7 +779,8 @@ static void path_put_conditional(struct path *path, struct nameidata *nd)
mntput(path->mnt); mntput(path->mnt);
} }
static inline void path_to_nameidata(struct path *path, struct nameidata *nd) static inline void path_to_nameidata(const struct path *path,
struct nameidata *nd)
{ {
if (!(nd->flags & LOOKUP_RCU)) { if (!(nd->flags & LOOKUP_RCU)) {
dput(nd->path.dentry); dput(nd->path.dentry);
...@@ -791,20 +792,20 @@ static inline void path_to_nameidata(struct path *path, struct nameidata *nd) ...@@ -791,20 +792,20 @@ static inline void path_to_nameidata(struct path *path, struct nameidata *nd)
} }
static __always_inline int static __always_inline int
__do_follow_link(struct path *path, struct nameidata *nd, void **p) __do_follow_link(const struct path *link, struct nameidata *nd, void **p)
{ {
int error; int error;
struct dentry *dentry = path->dentry; struct dentry *dentry = link->dentry;
touch_atime(path->mnt, dentry); touch_atime(link->mnt, dentry);
nd_set_link(nd, NULL); nd_set_link(nd, NULL);
if (path->mnt != nd->path.mnt) { if (link->mnt != nd->path.mnt) {
path_to_nameidata(path, nd); path_to_nameidata(link, nd);
nd->inode = nd->path.dentry->d_inode; nd->inode = nd->path.dentry->d_inode;
dget(dentry); dget(dentry);
} }
mntget(path->mnt); mntget(link->mnt);
nd->last_type = LAST_BIND; nd->last_type = LAST_BIND;
*p = dentry->d_inode->i_op->follow_link(dentry, nd); *p = dentry->d_inode->i_op->follow_link(dentry, nd);
...@@ -2348,11 +2349,12 @@ struct file *do_filp_open(int dfd, const char *pathname, ...@@ -2348,11 +2349,12 @@ struct file *do_filp_open(int dfd, const char *pathname,
nd.flags = flags; nd.flags = flags;
filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname); filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname);
while (unlikely(!filp)) { /* trailing symlink */ while (unlikely(!filp)) { /* trailing symlink */
struct path holder; struct path link = path;
struct inode *linki = link.dentry->d_inode;
void *cookie; void *cookie;
error = -ELOOP; error = -ELOOP;
/* S_ISDIR part is a temporary automount kludge */ /* S_ISDIR part is a temporary automount kludge */
if (!(nd.flags & LOOKUP_FOLLOW) && !S_ISDIR(nd.inode->i_mode)) if (!(nd.flags & LOOKUP_FOLLOW) && !S_ISDIR(linki->i_mode))
goto exit_dput; goto exit_dput;
if (count++ == 32) if (count++ == 32)
goto exit_dput; goto exit_dput;
...@@ -2368,23 +2370,22 @@ struct file *do_filp_open(int dfd, const char *pathname, ...@@ -2368,23 +2370,22 @@ struct file *do_filp_open(int dfd, const char *pathname,
* just set LAST_BIND. * just set LAST_BIND.
*/ */
nd.flags |= LOOKUP_PARENT; nd.flags |= LOOKUP_PARENT;
error = security_inode_follow_link(path.dentry, &nd); error = security_inode_follow_link(link.dentry, &nd);
if (error) if (error)
goto exit_dput; goto exit_dput;
error = __do_follow_link(&path, &nd, &cookie); error = __do_follow_link(&link, &nd, &cookie);
if (unlikely(error)) { if (unlikely(error)) {
if (!IS_ERR(cookie) && nd.inode->i_op->put_link) if (!IS_ERR(cookie) && linki->i_op->put_link)
nd.inode->i_op->put_link(path.dentry, &nd, cookie); linki->i_op->put_link(link.dentry, &nd, cookie);
/* nd.path had been dropped */ /* nd.path had been dropped */
nd.path = path; nd.path = link;
goto out_path; goto out_path;
} }
holder = path;
nd.flags &= ~LOOKUP_PARENT; nd.flags &= ~LOOKUP_PARENT;
filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname); filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname);
if (nd.inode->i_op->put_link) if (linki->i_op->put_link)
nd.inode->i_op->put_link(holder.dentry, &nd, cookie); linki->i_op->put_link(link.dentry, &nd, cookie);
path_put(&holder); path_put(&link);
} }
out: out:
if (nd.root.mnt) if (nd.root.mnt)
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* some fast and compact auxiliary data. * some fast and compact auxiliary data.
*/ */
#if defined(CONFIG_SMP) #if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
#define LIST_BL_LOCKMASK 1UL #define LIST_BL_LOCKMASK 1UL
#else #else
#define LIST_BL_LOCKMASK 0UL #define LIST_BL_LOCKMASK 0UL
......
...@@ -916,7 +916,7 @@ static void cgroup_d_remove_dir(struct dentry *dentry) ...@@ -916,7 +916,7 @@ static void cgroup_d_remove_dir(struct dentry *dentry)
parent = dentry->d_parent; parent = dentry->d_parent;
spin_lock(&parent->d_lock); spin_lock(&parent->d_lock);
spin_lock(&dentry->d_lock); spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED);
list_del_init(&dentry->d_u.d_child); list_del_init(&dentry->d_u.d_child);
spin_unlock(&dentry->d_lock); spin_unlock(&dentry->d_lock);
spin_unlock(&parent->d_lock); spin_unlock(&parent->d_lock);
......
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