diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-19 23:17:40 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-19 23:17:40 +0100 |
| commit | 10b38669d64c757cfd927e3820292c580ed70aae (patch) | |
| tree | 20d58530d5597ec25b19e4f982e6e4454bb6720f /net/ipv4 | |
| parent | PCI: Use ROM images from firmware only if no other ROM source available (diff) | |
| parent | xfs: ensure we capture IO errors correctly (diff) | |
| download | linux-10b38669d64c757cfd927e3820292c580ed70aae.tar.xz linux-10b38669d64c757cfd927e3820292c580ed70aae.zip | |
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()
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions