tree 47f43d7332e83a3f73d7660bdac2272882934296
parent 6c31e7ee48c91ef271b9d092d8d5698df0c72e22
parent 74e2d06521913443c7e2697037909f5efc200ec5
author Linus Torvalds <torvalds@linux-foundation.org> 1232991857 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1232991857 -0800

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

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  Long btree pointers are still 64 bit on disk
  [XFS] Remove the rest of the macro-to-function indirections.
  xfs: sanity check attr fork size
  xfs: fix bad_features2 fixups for the root filesystem
  xfs: add a lock class for group/project dquots
  xfs: lockdep annotations for xfs_dqlock2
  xfs: add a separate lock class for the per-mount list of dquots
  xfs: use mnt_want_write in compat_attrmulti ioctl
  xfs: fix dentry aliasing issues in open_by_handle