From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Mar 2010 16:15:33 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0f2cc4ecd81dc1917a041dc93db0ada28f8356fa;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (52 commits)
  init: Open /dev/console from rootfs
  mqueue: fix typo "failues" -> "failures"
  mqueue: only set error codes if they are really necessary
  mqueue: simplify do_open() error handling
  mqueue: apply mathematics distributivity on mq_bytes calculation
  mqueue: remove unneeded info->messages initialization
  mqueue: fix mq_open() file descriptor leak on user-space processes
  fix race in d_splice_alias()
  set S_DEAD on unlink() and non-directory rename() victims
  vfs: add NOFOLLOW flag to umount(2)
  get rid of ->mnt_parent in tomoyo/realpath
  hppfs can use existing proc_mnt, no need for do_kern_mount() in there
  Mirror MS_KERNMOUNT in ->mnt_flags
  get rid of useless vfsmount_lock use in put_mnt_ns()
  Take vfsmount_lock to fs/internal.h
  get rid of insanity with namespace roots in tomoyo
  take check for new events in namespace (guts of mounts_poll()) to namespace.c
  Don't mess with generic_permission() under ->d_lock in hpfs
  sanitize const/signedness for udf
  nilfs: sanitize const/signedness in dealing with ->d_name.name
  ...

Fix up fairly trivial (famous last words...) conflicts in
drivers/infiniband/core/uverbs_main.c and security/tomoyo/realpath.c
---

0f2cc4ecd81dc1917a041dc93db0ada28f8356fa
diff --cc security/tomoyo/realpath.c
index c00df45c7ede,455bc391b76d..cf7d61f781b9
--- a/security/tomoyo/realpath.c
+++ b/security/tomoyo/realpath.c
@@@ -88,30 -89,15 +88,15 @@@ int tomoyo_realpath_from_path2(struct p
  		sp = dentry->d_op->d_dname(dentry, newname + offset,
  					   newname_len - offset);
  	} else {
- 		/* Taken from d_namespace_path(). */
- 		struct path root;
- 		struct path ns_root = { };
- 		struct path tmp;
+ 		struct path ns_root = {.mnt = NULL, .dentry = NULL};
  
- 		read_lock(&current->fs->lock);
- 		root = current->fs->root;
- 		path_get(&root);
- 		read_unlock(&current->fs->lock);
- 		spin_lock(&vfsmount_lock);
- 		if (root.mnt && root.mnt->mnt_ns)
- 			ns_root.mnt = mntget(root.mnt->mnt_ns->root);
- 		if (ns_root.mnt)
- 			ns_root.dentry = dget(ns_root.mnt->mnt_root);
- 		spin_unlock(&vfsmount_lock);
  		spin_lock(&dcache_lock);
- 		tmp = ns_root;
- 		sp = __d_path(path, &tmp, newname, newname_len);
+ 		/* go to whatever namespace root we are under */
+ 		sp = __d_path(path, &ns_root, newname, newname_len);
  		spin_unlock(&dcache_lock);
- 		path_put(&root);
- 		path_put(&ns_root);
  		/* Prepend "/proc" prefix if using internal proc vfs mount. */
- 		if (!IS_ERR(sp) && (path->mnt->mnt_parent == path->mnt) &&
+ 		if (!IS_ERR(sp) && (path->mnt->mnt_flags & MNT_INTERNAL) &&
 -		    (strcmp(path->mnt->mnt_sb->s_type->name, "proc") == 0)) {
 +		    (path->mnt->mnt_sb->s_magic == PROC_SUPER_MAGIC)) {
  			sp -= 5;
  			if (sp >= newname)
  				memcpy(sp, "/proc", 5);