| commit | bb4c7e9a9908548b458f34afb2fee74dc0d49f90 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Feb 23 15:38:57 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Feb 23 15:38:57 2012 -0800 |
| tree | 5f9c05a3d74215826ba0d43881269bd3f7339090 | |
| parent | 73c8e679aa8d123c1b05fa837daacd0aa0c4cb85 [diff] | |
| parent | c922bbc819324558e61402a7a76c10c550ca61bc [diff] |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs A fix from Jesper Juhl removes an assignment in an ASSERT when a compare is intended. Two fixes from Mitsuo Hayasaka address off-by-ones in XFS quota enforcement. * 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: make inode quota check more general xfs: change available ranges of softlimit and hardlimit in quota check XFS: xfs_trans_add_item() - don't assign in ASSERT() when compare is intended