From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Jan 2012 23:49:54 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f9156c7288e2d11501ded4d7fe6d9a3a41ee4057;p=~shefty%2Frdma-dev.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (62 commits)
  Btrfs: use larger system chunks
  Btrfs: add a delalloc mutex to inodes for delalloc reservations
  Btrfs: space leak tracepoints
  Btrfs: protect orphan block rsv with spin_lock
  Btrfs: add allocator tracepoints
  Btrfs: don't call btrfs_throttle in file write
  Btrfs: release space on error in page_mkwrite
  Btrfs: fix btrfsck error 400 when truncating a compressed
  Btrfs: do not use btrfs_end_transaction_throttle everywhere
  Btrfs: add balance progress reporting
  Btrfs: allow for resuming restriper after it was paused
  Btrfs: allow for canceling restriper
  Btrfs: allow for pausing restriper
  Btrfs: add skip_balance mount option
  Btrfs: recover balance on mount
  Btrfs: save balance parameters to disk
  Btrfs: soft profile changing mode (aka soft convert)
  Btrfs: implement online profile changing
  Btrfs: do not reduce profile in do_chunk_alloc()
  Btrfs: virtual address space subset filter
  ...

Fix up trivial conflict in fs/btrfs/ioctl.c due to the use of the new
mnt_drop_write_file() helper.
---

f9156c7288e2d11501ded4d7fe6d9a3a41ee4057
diff --cc fs/btrfs/ioctl.c
index 5441ff1480f,6834be4c870..2db7c1455c7
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@@ -255,13 -263,15 +263,15 @@@ static int btrfs_ioctl_setflags(struct 
  	btrfs_update_iflags(inode);
  	inode->i_ctime = CURRENT_TIME;
  	ret = btrfs_update_inode(trans, root, inode);
- 	BUG_ON(ret);
  
  	btrfs_end_transaction(trans, root);
+  out_drop:
+ 	if (ret) {
+ 		ip->flags = ip_oldflags;
+ 		inode->i_flags = i_oldflags;
+ 	}
  
 -	mnt_drop_write(file->f_path.mnt);
 +	mnt_drop_write_file(file);
- 
- 	ret = 0;
   out_unlock:
  	mutex_unlock(&inode->i_mutex);
  	return ret;