diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-17 08:27:59 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-17 08:27:59 -0800 |
commit | fa4c95bfdb85d568ae327d57aa33a4f55bab79c4 (patch) | |
tree | 2f827ba303bbb5be30442388f298e1fe532da4d0 /lib/sort.c | |
parent | 60da5bf47dd3d301a1d3bd4f0a4b9e29a184515c (diff) | |
parent | 56df127855b593cc4b2e94ce8df5c609b0109b42 (diff) | |
download | op-kernel-dev-fa4c95bfdb85d568ae327d57aa33a4f55bab79c4.zip op-kernel-dev-fa4c95bfdb85d568ae327d57aa33a4f55bab79c4.tar.gz |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull ext3, udf, quota fixes from Jan Kara:
"Some ext3 & quota cleanups and couple of udf fixes"
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
quota: Use the pre-processor to compile out quotactl_cmd_write when !CONFIG_BLOCK
ext3: drop if around WARN_ON
ext3: get rid of the duplicate code on ext3_fill_super
udf: remove un-needed variable from inode_getblk
udf: don't increment lenExtents while writing to a hole
udf: fix memory leak while allocating blocks during write
Diffstat (limited to 'lib/sort.c')
0 files changed, 0 insertions, 0 deletions