tree 7324d6b53ad3c18c244094ad5d51b500716d7304
parent d65773b22b749252b2805dcf96bdeb951a9481d8
parent d060646436233912178e6b9e3a7f30a41214220f
author Linus Torvalds <torvalds@linux-foundation.org> 1326844496 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1326844496 -0800

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