From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Jan 2012 23:09:01 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=609eac1c152353ee4cd6f292d49f0aa0b885951a;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'for-linus' of git://git./linux/kernel/git/ericvh/v9fs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  fs/9p: iattr_valid flags are kernel internal flags map them to 9p values.
  fs/9p: We should not allocate a new inode when creating hardlines.
  fs/9p: v9fs_stat2inode should update suid/sgid bits.
  9p: Reduce object size with CONFIG_NET_9P_DEBUG
  fs/9p: check schedule_timeout_interruptible return value

Fix up trivial conflicts in fs/9p/{vfs_inode.c,vfs_inode_dotl.c} due to
debug messages having changed to use p9_debug() on one hand, and the
changes for umode_t on the other.
---

609eac1c152353ee4cd6f292d49f0aa0b885951a
diff --cc fs/9p/vfs_inode.c
index e0f20de6aa2b,c8fe480d0db0..014c8dd62962
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@@ -94,14 -127,14 +122,14 @@@ static int p9mode2perm(struct v9fs_sess
   * @rdev: major number, minor number in case of device files.
   *
   */
 -static int p9mode2unixmode(struct v9fs_session_info *v9ses,
 -			   struct p9_wstat *stat, dev_t *rdev)
 +static umode_t p9mode2unixmode(struct v9fs_session_info *v9ses,
 +			       struct p9_wstat *stat, dev_t *rdev)
  {
  	int res;
 -	int mode = stat->mode;
 +	u32 mode = stat->mode;
  
- 	res = mode & S_IALLUGO;
  	*rdev = 0;
+ 	res = p9mode2perm(v9ses, stat);
  
  	if ((mode & P9_DMDIR) == P9_DMDIR)
  		res |= S_IFDIR;
@@@ -329,8 -352,8 +346,8 @@@ int v9fs_init_inode(struct v9fs_session
  
  		break;
  	default:
- 		P9_DPRINTK(P9_DEBUG_ERROR, "BAD mode 0x%hx S_IFMT 0x%x\n",
- 			   mode, mode & S_IFMT);
 -		p9_debug(P9_DEBUG_ERROR, "BAD mode 0x%x S_IFMT 0x%x\n",
++		p9_debug(P9_DEBUG_ERROR, "BAD mode 0x%hx S_IFMT 0x%x\n",
+ 			 mode, mode & S_IFMT);
  		err = -EINVAL;
  		goto error;
  	}
@@@ -352,7 -375,7 +369,7 @@@ struct inode *v9fs_get_inode(struct sup
  	struct inode *inode;
  	struct v9fs_session_info *v9ses = sb->s_fs_info;
  
- 	P9_DPRINTK(P9_DEBUG_VFS, "super block: %p mode: %ho\n", sb, mode);
 -	p9_debug(P9_DEBUG_VFS, "super block: %p mode: %o\n", sb, mode);
++	p9_debug(P9_DEBUG_VFS, "super block: %p mode: %ho\n", sb, mode);
  
  	inode = new_inode(sb);
  	if (!inode) {
@@@ -1333,10 -1362,10 +1355,10 @@@ static int v9fs_vfs_mkspecial(struct in
  static int
  v9fs_vfs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
  {
- 	P9_DPRINTK(P9_DEBUG_VFS, " %lu,%s,%s\n", dir->i_ino,
- 					dentry->d_name.name, symname);
+ 	p9_debug(P9_DEBUG_VFS, " %lu,%s,%s\n",
+ 		 dir->i_ino, dentry->d_name.name, symname);
  
 -	return v9fs_vfs_mkspecial(dir, dentry, S_IFLNK, symname);
 +	return v9fs_vfs_mkspecial(dir, dentry, P9_DMSYMLINK, symname);
  }
  
  /**
@@@ -1391,16 -1419,14 +1412,16 @@@ clunk_fid
   */
  
  static int
 -v9fs_vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
 +v9fs_vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t rdev)
  {
 +	struct v9fs_session_info *v9ses = v9fs_inode2v9ses(dir);
  	int retval;
  	char *name;
 +	u32 perm;
  
- 	P9_DPRINTK(P9_DEBUG_VFS,
- 		" %lu,%s mode: %hx MAJOR: %u MINOR: %u\n", dir->i_ino,
- 		dentry->d_name.name, mode, MAJOR(rdev), MINOR(rdev));
 -	p9_debug(P9_DEBUG_VFS, " %lu,%s mode: %x MAJOR: %u MINOR: %u\n",
++	p9_debug(P9_DEBUG_VFS, " %lu,%s mode: %hx MAJOR: %u MINOR: %u\n",
+ 		 dir->i_ino, dentry->d_name.name, mode,
+ 		 MAJOR(rdev), MINOR(rdev));
  
  	if (!new_valid_dev(rdev))
  		return -EINVAL;
diff --cc fs/9p/vfs_inode_dotl.c
index 8ef152ac6a16,7ca7171273d1..a1e6c990cd41
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@@ -283,8 -283,8 +283,8 @@@ v9fs_vfs_create_dotl(struct inode *dir
  	}
  
  	name = (char *) dentry->d_name.name;
- 	P9_DPRINTK(P9_DEBUG_VFS, "v9fs_vfs_create_dotl: name:%s flags:0x%x "
- 			"mode:0x%hx\n", name, flags, omode);
 -	p9_debug(P9_DEBUG_VFS, "name:%s flags:0x%x mode:0x%x\n",
++	p9_debug(P9_DEBUG_VFS, "name:%s flags:0x%x mode:0x%hx\n",
+ 		 name, flags, omode);
  
  	dfid = v9fs_fid_lookup(dentry->d_parent);
  	if (IS_ERR(dfid)) {
@@@ -813,9 -850,9 +850,9 @@@ v9fs_vfs_mknod_dotl(struct inode *dir, 
  	struct dentry *dir_dentry;
  	struct posix_acl *dacl = NULL, *pacl = NULL;
  
- 	P9_DPRINTK(P9_DEBUG_VFS,
- 		" %lu,%s mode: %hx MAJOR: %u MINOR: %u\n", dir->i_ino,
- 		dentry->d_name.name, omode, MAJOR(rdev), MINOR(rdev));
 -	p9_debug(P9_DEBUG_VFS, " %lu,%s mode: %x MAJOR: %u MINOR: %u\n",
++	p9_debug(P9_DEBUG_VFS, " %lu,%s mode: %hx MAJOR: %u MINOR: %u\n",
+ 		 dir->i_ino, dentry->d_name.name, omode,
+ 		 MAJOR(rdev), MINOR(rdev));
  
  	if (!new_valid_dev(rdev))
  		return -EINVAL;