From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Jan 2012 20:51:21 +0000 (-0800)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
X-Git-Tag: v3.3-rc1~149
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ac69e0928054ff29a5049902fb477f9c7605c773;p=karo-tx-linux.git

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
---

ac69e0928054ff29a5049902fb477f9c7605c773
diff --cc fs/ext3/ioctl.c
index 8e37c41a071b,e7b2ed9d36cc..4af574ce4a46
--- a/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/ext4/ioctl.c
index d37b3bb2a3b8,46a8de6f2089..e87a932b073b
--- a/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: {