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

diff --cc fs/ext2/ialloc.c
Simple merge

diff --cc fs/ext2/super.c
Simple merge

diff --cc fs/ext3/ialloc.c
Simple merge

diff --cc fs/ext3/inode.c
Simple merge

diff --cc fs/ext3/ioctl.c
index 8e37c41a071b31e90756f9b0762e37a2ac362065,e7b2ed9d36cc7cbc885ca35039fbe80146a047a8..4af574ce4a4638c651006ff8ce73ca61dbe7a14f
--- 1/fs/ext3/ioctl.c
--- 2/fs/ext3/ioctl.c
+++ b/fs/ext3/ioctl.c
@@@ -146,8 -147,11 +147,11 @@@ flags_out
                        err = ext3_mark_iloc_dirty(handle, inode, &iloc);
                }
                ext3_journal_stop(handle);
+ 
+ unlock_out:
+               mutex_unlock(&inode->i_mutex);
  setversion_out:
 -              mnt_drop_write(filp->f_path.mnt);
 +              mnt_drop_write_file(filp);
                return err;
        }
        case EXT3_IOC_GETRSVSZ:

diff --cc fs/ext3/namei.c
Simple merge

diff --cc fs/ext3/super.c
Simple merge

diff --cc fs/ext4/extents.c
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/ext4/ioctl.c
index d37b3bb2a3b8748b79f3c0e02ab4c17909c5f189,46a8de6f2089e521288fcdd05de022c4a7374810..e87a932b073bcf7db1916db8ef1ac469c676ca63
--- 1/fs/ext4/ioctl.c
--- 2/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@@ -170,8 -171,11 +171,11 @@@ flags_out
                        err = ext4_mark_iloc_dirty(handle, inode, &iloc);
                }
                ext4_journal_stop(handle);
+ 
+ unlock_out:
+               mutex_unlock(&inode->i_mutex);
  setversion_out:
 -              mnt_drop_write(filp->f_path.mnt);
 +              mnt_drop_write_file(filp);
                return err;
        }
        case EXT4_IOC_GROUP_EXTEND: {

diff --cc fs/ext4/page-io.c
Simple merge

diff --cc fs/jbd/journal.c
Simple merge

diff --cc fs/reiserfs/super.c
Simple merge

diff --cc fs/udf/inode.c
Simple merge

diff --cc fs/udf/super.c
Simple merge