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
  ...

diff --combined MAINTAINERS
index ebaf77ebd8b717e8fe42208f7b49c9b38f55e180,faf43fc6153f08f1a70a483e4246cf867efdb6a1..908226600f16c8d2efd7c6efc384cc5a318d7bc7
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1945,12 -1945,6 +1945,12 @@@ L:    lm-sensors@lm-sensors.or
  W:    http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
  S:    Maintained
  
 +HYPERVISOR VIRTUAL CONSOLE DRIVER
 +L:    linuxppc-dev@ozlabs.org
 +L:    linux-kernel@vger.kernel.org
 +S:    Odd Fixes
 +F:    drivers/char/hvc_*
 +
  GSPCA FINEPIX SUBDRIVER
  P:    Frank Zago
  M:    frank@zago.net
@@@ -3104,7 -3098,7 +3104,7 @@@ M:      shemminger@linux-foundation.or
  L:    netem@lists.linux-foundation.org
  S:    Maintained
  
 -NETERION (S2IO) Xframe 10GbE DRIVER
 +NETERION (S2IO) 10GbE DRIVER (xframe/vxge)
  P:    Ramkrishna Vepa
  M:    ram.vepa@neterion.com
  P:    Rastapur Santosh
@@@ -3113,11 -3107,8 +3113,11 @@@ P:    Sivakumar Subraman
  M:    sivakumar.subramani@neterion.com
  P:    Sreenivasa Honnur
  M:    sreenivasa.honnur@neterion.com
 +P:    Anil Murthy
 +M:    anil.murthy@neterion.com
  L:    netdev@vger.kernel.org
 -W:    http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous
 +W:    http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
 +W:    http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
  S:    Supported
  
  NETFILTER/IPTABLES/IPCHAINS
@@@ -4969,7 -4960,8 +4969,8 @@@ S:      Supporte
  
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
- P:    Bill O'Donnell
+ P:    Felix Blyakher
+ M:    felixb@sgi.com
  M:    xfs-masters@oss.sgi.com
  L:    xfs@oss.sgi.com
  W:    http://oss.sgi.com/projects/xfs

diff --combined fs/xfs/linux-2.6/xfs_iops.c
index 2940612e3aeb4bf2f47c17bed0ed7982e121f327,631d0137551e105d62f667fc6de35a62f4210337..6075382336d70b0feca5d7e84b1a53b9926987fd
--- 1/fs/xfs/linux-2.6/xfs_iops.c
--- 2/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@@ -211,8 -211,13 +211,13 @@@ xfs_vn_mknod
         * Irix uses Missed'em'V split, but doesn't want to see
         * the upper 5 bits of (14bit) major.
         */
-       if (unlikely(!sysv_valid_dev(rdev) || MAJOR(rdev) & ~0x1ff))
-               return -EINVAL;
+       if (S_ISCHR(mode) || S_ISBLK(mode)) {
+               if (unlikely(!sysv_valid_dev(rdev) || MAJOR(rdev) & ~0x1ff))
+                       return -EINVAL;
+               rdev = sysv_encode_dev(rdev);
+       } else {
+               rdev = 0;
+       }
  
        if (test_default_acl && test_default_acl(dir)) {
                if (!_ACL_ALLOC(default_acl)) {
@@@ -224,28 -229,11 +229,11 @@@
                }
        }
  
-       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;
  
@@@ -416,7 -404,7 +404,7 @@@ xfs_vn_symlink
        mode_t          mode;
  
        mode = S_IFLNK |
 -              (irix_symlink_mode ? 0777 & ~current->fs->umask : S_IRWXUGO);
 +              (irix_symlink_mode ? 0777 & ~current_umask() : S_IRWXUGO);
        xfs_dentry_to_name(&name, dentry);
  
        error = xfs_symlink(XFS_I(dir), &name, symname, mode, &cip, NULL);
@@@ -553,9 -541,6 +541,6 @@@ xfs_vn_getattr
        stat->uid = ip->i_d.di_uid;
        stat->gid = ip->i_d.di_gid;
        stat->ino = ip->i_ino;
- #if XFS_BIG_INUMS
-       stat->ino += mp->m_inoadd;
- #endif
        stat->atime = inode->i_atime;
        stat->mtime.tv_sec = ip->i_d.di_mtime.t_sec;
        stat->mtime.tv_nsec = ip->i_d.di_mtime.t_nsec;