From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Apr 2009 16:52:29 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ac7c1a776dfe1a9c83ea7885f858f5f1a144d8af;p=linux-2.6-omap-h63xx.git

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs: (61 commits)
  Revert "xfs: increase the maximum number of supported ACL entries"
  xfs: cleanup uuid handling
  xfs: remove m_attroffset
  xfs: fix various typos
  xfs: pagecache usage optimization
  xfs: remove m_litino
  xfs: kill ino64 mount option
  xfs: kill mutex_t typedef
  xfs: increase the maximum number of supported ACL entries
  xfs: factor out code to find the longest free extent in the AG
  xfs: kill VN_BAD
  xfs: kill vn_atime_* helpers.
  xfs: cleanup xlog_bread
  xfs: cleanup xlog_recover_do_trans
  xfs: remove another leftover of the old inode log item format
  xfs: cleanup log unmount handling
  Fix xfs debug build breakage by pushing xfs_error.h after
  xfs: include header files for prototypes
  xfs: make symbols static
  xfs: move declaration to header file
  ...
---

ac7c1a776dfe1a9c83ea7885f858f5f1a144d8af
diff --cc fs/xfs/linux-2.6/xfs_iops.c
index 2940612e3ae,631d0137551..6075382336d
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@@ -224,28 -229,11 +229,11 @@@ xfs_vn_mknod
  		}
  	}
  
- 	xfs_dentry_to_name(&name, dentry);
- 
  	if (IS_POSIXACL(dir) && !default_acl)
 -		mode &= ~current->fs->umask;
 +		mode &= ~current_umask();
  
- 	switch (mode & S_IFMT) {
- 	case S_IFCHR:
- 	case S_IFBLK:
- 	case S_IFIFO:
- 	case S_IFSOCK:
- 		rdev = sysv_encode_dev(rdev);
- 	case S_IFREG:
- 		error = xfs_create(XFS_I(dir), &name, mode, rdev, &ip, NULL);
- 		break;
- 	case S_IFDIR:
- 		error = xfs_mkdir(XFS_I(dir), &name, mode, &ip, NULL);
- 		break;
- 	default:
- 		error = EINVAL;
- 		break;
- 	}
- 
+ 	xfs_dentry_to_name(&name, dentry);
+ 	error = xfs_create(XFS_I(dir), &name, mode, rdev, &ip, NULL);
  	if (unlikely(error))
  		goto out_free_acl;