tree 97972fe4970e5074ec3944c7cd5179fb2bfe5b36
parent 80a04d3f2f94fb68b5df05e3ac6697130bc3467a
parent dc2a5536d633dd2318f82f3d5ad3c9e43cfc21d7
author Linus Torvalds <torvalds@linux-foundation.org> 1239658513 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1239658513 -0700

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

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: remove xfs_flush_space
  xfs: flush delayed allcoation blocks on ENOSPC in create
  xfs: block callers of xfs_flush_inodes() correctly
  xfs: make inode flush at ENOSPC synchronous
  xfs: use xfs_sync_inodes() for device flushing
  xfs: inform the xfsaild of the push target before sleeping
  xfs: prevent unwritten extent conversion from blocking I/O completion
  xfs: fix double free of inode
  xfs: validate log feature fields correctly