author | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 9 Jan 2012 20:51:21 +0000 (12:51 -0800) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 9 Jan 2012 20:51:21 +0000 (12:51 -0800) | ||
commit | ac69e0928054ff29a5049902fb477f9c7605c773 | |
tree | 05be6b9285186823452e0adeffe40e1dfee6e354 | tree | snapshot (tar.xz tar.gz zip) |
parent | 9e203936eac786f9268d6a13e6442d2accef1829 | commit | diff |
parent | 302bf2f3259948c93361d501b04a5ed69c3bd4f8 | commit | diff |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
ext2/3/4: delete unneeded includes of module.h
ext{3,4}: Fix potential race when setversion ioctl updates inode
udf: Mark LVID buffer as uptodate before marking it dirty
ext3: Don't warn from writepage when readonly inode is spotted after error
jbd: Remove j_barrier mutex
reiserfs: Force inode evictions before umount to avoid crash
reiserfs: Fix quota mount option parsing
udf: Treat symlink component of type 2 as /
udf: Fix deadlock when converting file from in-ICB one to normal one
udf: Cleanup calling convention of inode_getblk()
ext2: Fix error handling on inode bitmap corruption
ext3: Fix error handling on inode bitmap corruption
ext3: replace ll_rw_block with other functions
ext3: NULL dereference in ext3_evict_inode()
jbd: clear revoked flag on buffers before a new transaction started
ext3: call ext3_mark_recovery_complete() when recovery is really needed
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
ext2/3/4: delete unneeded includes of module.h
ext{3,4}: Fix potential race when setversion ioctl updates inode
udf: Mark LVID buffer as uptodate before marking it dirty
ext3: Don't warn from writepage when readonly inode is spotted after error
jbd: Remove j_barrier mutex
reiserfs: Force inode evictions before umount to avoid crash
reiserfs: Fix quota mount option parsing
udf: Treat symlink component of type 2 as /
udf: Fix deadlock when converting file from in-ICB one to normal one
udf: Cleanup calling convention of inode_getblk()
ext2: Fix error handling on inode bitmap corruption
ext3: Fix error handling on inode bitmap corruption
ext3: replace ll_rw_block with other functions
ext3: NULL dereference in ext3_evict_inode()
jbd: clear revoked flag on buffers before a new transaction started
ext3: call ext3_mark_recovery_complete() when recovery is really needed
15 files changed:
fs/ext2/ialloc.c | diff1 | | diff2 | | blob | history |
fs/ext2/super.c | diff1 | | diff2 | | blob | history |
fs/ext3/ialloc.c | diff1 | | diff2 | | blob | history |
fs/ext3/inode.c | diff1 | | diff2 | | blob | history |
fs/ext3/ioctl.c | diff1 | | diff2 | | blob | history |
fs/ext3/namei.c | diff1 | | diff2 | | blob | history |
fs/ext3/super.c | diff1 | | diff2 | | blob | history |
fs/ext4/extents.c | diff1 | | diff2 | | blob | history |
fs/ext4/inode.c | diff1 | | diff2 | | blob | history |
fs/ext4/ioctl.c | diff1 | | diff2 | | blob | history |
fs/ext4/page-io.c | diff1 | | diff2 | | blob | history |
fs/jbd/journal.c | diff1 | | diff2 | | blob | history |
fs/reiserfs/super.c | diff1 | | diff2 | | blob | history |
fs/udf/inode.c | diff1 | | diff2 | | blob | history |
fs/udf/super.c | diff1 | | diff2 | | blob | history |