From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Jan 2012 23:54:56 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: v3.3-rc1~24
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=22b4eb5e3174efb49791c62823d0cccc35394c36;p=linux.git

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

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: cleanup xfs_file_aio_write
  xfs: always return with the iolock held from xfs_file_aio_write_checks
  xfs: remove the i_new_size field in struct xfs_inode
  xfs: remove the i_size field in struct xfs_inode
  xfs: replace i_pin_wait with a bit waitqueue
  xfs: replace i_flock with a sleeping bitlock
  xfs: make i_flags an unsigned long
  xfs: remove the if_ext_max field in struct xfs_ifork
  xfs: remove the unused dm_attrs structure
  xfs: cleanup xfs_iomap_eof_align_last_fsb
  xfs: remove xfs_itruncate_data
---

22b4eb5e3174efb49791c62823d0cccc35394c36