| commit | 8cb280c90f9cfaab3ba3afbace0b1711dee80d0c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 02 09:13:36 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 02 09:13:36 2010 -0800 |
| tree | b98d29b0159dd763afab1670d58019b6cb58cfa0 | |
| parent | 8fed709f343346a77888c2eef8f2d41bc637bef6 [diff] | |
| parent | c76febef574fd86566bbdf1a73a547a439115c25 [diff] |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: only run xfs_error_test if error injection is active xfs: avoid moving stale inodes in the AIL xfs: delayed alloc blocks beyond EOF are valid after writeback xfs: push stale, pinned buffers on trylock failures xfs: fix failed write truncation handling.