From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 19 Mar 2013 22:17:40 +0000 (-0700)
Subject: Merge tag 'for-linus-v3.9-rc4' of git://oss.sgi.com/xfs/xfs
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=10b38669d64c757cfd927e3820292c580ed70aae;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'for-linus-v3.9-rc4' of git://oss.sgi.com/xfs/xfs

Pull XFS fixes from Ben Myers:

 - Fix for a potential infinite loop which was introduced in commit
   4d559a3bcb73 ("xfs: limit speculative prealloc near ENOSPC
   thresholds")

 - Fix for the return type of xfs_iomap_eof_prealloc_initial_size from
   commit a1e16c26660b ("xfs: limit speculative prealloc size on sparse
   files")

 - Fix for a failed buffer readahead causing subsequent callers to fail
   incorrectly

* tag 'for-linus-v3.9-rc4' of git://oss.sgi.com/xfs/xfs:
  xfs: ensure we capture IO errors correctly
  xfs: fix xfs_iomap_eof_prealloc_initial_size type
  xfs: fix potential infinite loop in xfs_iomap_prealloc_size()
---

10b38669d64c757cfd927e3820292c580ed70aae