From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Jan 2011 17:08:29 +0000 (-0800)
Subject: Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.38-rc1~60
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=acda4721ae876dedab3fef04bbd8020bfa67ff0a;hp=-c

Merge branch 'vfs-scale-working' of git://git./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
---

acda4721ae876dedab3fef04bbd8020bfa67ff0a
diff --combined fs/namei.c
index 86643302079e,9cda4c452a6d..8df7a78ace58
--- a/fs/namei.c
+++ b/fs/namei.c
@@@ -202,7 -202,7 +202,7 @@@ static int acl_permission_check(struct 
   * @inode:	inode to check access rights for
   * @mask:	right to check for (%MAY_READ, %MAY_WRITE, %MAY_EXEC)
   * @check_acl:	optional callback to check for Posix ACLs
 - * @flags	IPERM_FLAG_ flags.
 + * @flags:	IPERM_FLAG_ flags.
   *
   * Used to check for read/write/execute permissions on a file.
   * We use "fsuid" for this, letting us set arbitrary permissions
@@@ -407,7 -407,7 +407,7 @@@ void path_put_long(struct path *path
  /**
   * nameidata_drop_rcu - drop this nameidata out of rcu-walk
   * @nd: nameidata pathwalk data to drop
 - * @Returns: 0 on success, -ECHLID on failure
 + * Returns: 0 on success, -ECHILD on failure
   *
   * Path walking has 2 modes, rcu-walk and ref-walk (see
   * Documentation/filesystems/path-lookup.txt). __drop_rcu* functions attempt
@@@ -468,7 -468,7 +468,7 @@@ static inline int nameidata_drop_rcu_ma
   * nameidata_dentry_drop_rcu - drop nameidata and dentry out of rcu-walk
   * @nd: nameidata pathwalk data to drop
   * @dentry: dentry to drop
 - * @Returns: 0 on success, -ECHLID on failure
 + * Returns: 0 on success, -ECHILD on failure
   *
   * nameidata_dentry_drop_rcu attempts to drop the current nd->path and nd->root,
   * and dentry into ref-walk. @dentry must be a path found by a do_lookup call on
@@@ -538,7 -538,7 +538,7 @@@ static inline int nameidata_dentry_drop
  /**
   * nameidata_drop_rcu_last - drop nameidata ending path walk out of rcu-walk
   * @nd: nameidata pathwalk data to drop
 - * @Returns: 0 on success, -ECHLID on failure
 + * Returns: 0 on success, -ECHILD on failure
   *
   * nameidata_drop_rcu_last attempts to drop the current nd->path into ref-walk.
   * nd->path should be the final element of the lookup, so nd->root is discarded.
@@@ -779,7 -779,8 +779,8 @@@ static void path_put_conditional(struc
  		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)) {
  		dput(nd->path.dentry);
@@@ -791,20 -792,20 +792,20 @@@
  }
  
  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;
- 	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);
  
- 	if (path->mnt != nd->path.mnt) {
- 		path_to_nameidata(path, nd);
+ 	if (link->mnt != nd->path.mnt) {
+ 		path_to_nameidata(link, nd);
  		nd->inode = nd->path.dentry->d_inode;
  		dget(dentry);
  	}
- 	mntget(path->mnt);
+ 	mntget(link->mnt);
  
  	nd->last_type = LAST_BIND;
  	*p = dentry->d_inode->i_op->follow_link(dentry, nd);
@@@ -1968,9 -1969,8 +1969,9 @@@ int may_open(struct path *path, int acc
  	return break_lease(inode, flag);
  }
  
 -static int handle_truncate(struct path *path)
 +static int handle_truncate(struct file *filp)
  {
 +	struct path *path = &filp->f_path;
  	struct inode *inode = path->dentry->d_inode;
  	int error = get_write_access(inode);
  	if (error)
@@@ -1984,7 -1984,7 +1985,7 @@@
  	if (!error) {
  		error = do_truncate(path->dentry, 0,
  				    ATTR_MTIME|ATTR_CTIME|ATTR_OPEN,
 -				    NULL);
 +				    filp);
  	}
  	put_write_access(inode);
  	return error;
@@@ -2082,7 -2082,7 +2083,7 @@@ static struct file *finish_open(struct 
  	}
  	if (!IS_ERR(filp)) {
  		if (will_truncate) {
 -			error = handle_truncate(&nd->path);
 +			error = handle_truncate(filp);
  			if (error) {
  				fput(filp);
  				filp = ERR_PTR(error);
@@@ -2348,11 -2348,12 +2349,12 @@@ reval
  	nd.flags = flags;
  	filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname);
  	while (unlikely(!filp)) { /* trailing symlink */
- 		struct path holder;
+ 		struct path link = path;
+ 		struct inode *linki = link.dentry->d_inode;
  		void *cookie;
  		error = -ELOOP;
  		/* 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;
  		if (count++ == 32)
  			goto exit_dput;
@@@ -2368,23 -2369,22 +2370,22 @@@
  		 * just set LAST_BIND.
  		 */
  		nd.flags |= LOOKUP_PARENT;
- 		error = security_inode_follow_link(path.dentry, &nd);
+ 		error = security_inode_follow_link(link.dentry, &nd);
  		if (error)
  			goto exit_dput;
- 		error = __do_follow_link(&path, &nd, &cookie);
+ 		error = __do_follow_link(&link, &nd, &cookie);
  		if (unlikely(error)) {
- 			if (!IS_ERR(cookie) && nd.inode->i_op->put_link)
- 				nd.inode->i_op->put_link(path.dentry, &nd, cookie);
+ 			if (!IS_ERR(cookie) && linki->i_op->put_link)
+ 				linki->i_op->put_link(link.dentry, &nd, cookie);
  			/* nd.path had been dropped */
- 			nd.path = path;
+ 			nd.path = link;
  			goto out_path;
  		}
- 		holder = path;
  		nd.flags &= ~LOOKUP_PARENT;
  		filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname);
- 		if (nd.inode->i_op->put_link)
- 			nd.inode->i_op->put_link(holder.dentry, &nd, cookie);
- 		path_put(&holder);
+ 		if (linki->i_op->put_link)
+ 			linki->i_op->put_link(link.dentry, &nd, cookie);
+ 		path_put(&link);
  	}
  out:
  	if (nd.root.mnt)
diff --combined kernel/cgroup.c
index ffb7bbad0638,a7837e2d9d6b..b24d7027b83c
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@@ -763,8 -763,9 +763,8 @@@ EXPORT_SYMBOL_GPL(cgroup_unlock)
   * -> cgroup_mkdir.
   */
  
 -static struct dentry *cgroup_lookup(struct inode *dir,
 -			struct dentry *dentry, struct nameidata *nd);
  static int cgroup_mkdir(struct inode *dir, struct dentry *dentry, int mode);
 +static struct dentry *cgroup_lookup(struct inode *, struct dentry *, struct nameidata *);
  static int cgroup_rmdir(struct inode *unused_dir, struct dentry *dentry);
  static int cgroup_populate_dir(struct cgroup *cgrp);
  static const struct inode_operations cgroup_dir_inode_operations;
@@@ -861,11 -862,6 +861,11 @@@ static void cgroup_diput(struct dentry 
  	iput(inode);
  }
  
 +static int cgroup_delete(const struct dentry *d)
 +{
 +	return 1;
 +}
 +
  static void remove_dir(struct dentry *d)
  {
  	struct dentry *parent = dget(d->d_parent);
@@@ -916,7 -912,7 +916,7 @@@ static void cgroup_d_remove_dir(struct 
  
  	parent = dentry->d_parent;
  	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);
  	spin_unlock(&dentry->d_lock);
  	spin_unlock(&parent->d_lock);
@@@ -1455,11 -1451,6 +1455,11 @@@ static int cgroup_set_super(struct supe
  
  static int cgroup_get_rootdir(struct super_block *sb)
  {
 +	static const struct dentry_operations cgroup_dops = {
 +		.d_iput = cgroup_diput,
 +		.d_delete = cgroup_delete,
 +	};
 +
  	struct inode *inode =
  		cgroup_new_inode(S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR, sb);
  	struct dentry *dentry;
@@@ -1477,8 -1468,6 +1477,8 @@@
  		return -ENOMEM;
  	}
  	sb->s_root = dentry;
 +	/* for everything else we want ->d_op set */
 +	sb->s_d_op = &cgroup_dops;
  	return 0;
  }
  
@@@ -2208,14 -2197,6 +2208,14 @@@ static const struct inode_operations cg
  	.rename = cgroup_rename,
  };
  
 +static struct dentry *cgroup_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
 +{
 +	if (dentry->d_name.len > NAME_MAX)
 +		return ERR_PTR(-ENAMETOOLONG);
 +	d_add(dentry, NULL);
 +	return NULL;
 +}
 +
  /*
   * Check if a file is a control file
   */
@@@ -2226,6 -2207,26 +2226,6 @@@ static inline struct cftype *__file_cft
  	return __d_cft(file->f_dentry);
  }
  
 -static int cgroup_delete_dentry(const struct dentry *dentry)
 -{
 -	return 1;
 -}
 -
 -static struct dentry *cgroup_lookup(struct inode *dir,
 -			struct dentry *dentry, struct nameidata *nd)
 -{
 -	static const struct dentry_operations cgroup_dentry_operations = {
 -		.d_delete = cgroup_delete_dentry,
 -		.d_iput = cgroup_diput,
 -	};
 -
 -	if (dentry->d_name.len > NAME_MAX)
 -		return ERR_PTR(-ENAMETOOLONG);
 -	d_set_d_op(dentry, &cgroup_dentry_operations);
 -	d_add(dentry, NULL);
 -	return NULL;
 -}
 -
  static int cgroup_create_file(struct dentry *dentry, mode_t mode,
  				struct super_block *sb)
  {