From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Apr 2011 15:26:58 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
X-Git-Tag: v2.6.39-rc5~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=019793b7554b18818624e9cf7a2ee8ba8cf6bda0

Merge git://git./linux/kernel/git/mason/btrfs-unstable

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: cleanup error handling in inode.c
  Btrfs: put the right bio if we have an error
  Btrfs: free bitmaps properly when evicting the cache
  Btrfs: Free free_space item properly in btrfs_trim_block_group()
  btrfs: add missing spin_unlock to a rare exit path
  Btrfs: check return value of kmalloc()
  btrfs: fix wrong allocating flag when reading page
  Btrfs: fix missing mutex_unlock in btrfs_del_dir_entries_in_log()
---

019793b7554b18818624e9cf7a2ee8ba8cf6bda0
diff --cc fs/btrfs/inode.c
index fcd66b6a8086,870869aab0b8..7cd8ab0ef04d
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@@ -4731,11 -4731,12 +4732,12 @@@ static int btrfs_mknod(struct inode *di
  	inode = btrfs_new_inode(trans, root, dir, dentry->d_name.name,
  				dentry->d_name.len, dir->i_ino, objectid,
  				BTRFS_I(dir)->block_group, mode, &index);
- 	err = PTR_ERR(inode);
- 	if (IS_ERR(inode))
+ 	if (IS_ERR(inode)) {
+ 		err = PTR_ERR(inode);
  		goto out_unlock;
+ 	}
  
 -	err = btrfs_init_inode_security(trans, inode, dir);
 +	err = btrfs_init_inode_security(trans, inode, dir, &dentry->d_name);
  	if (err) {
  		drop_inode = 1;
  		goto out_unlock;
@@@ -4792,11 -4793,12 +4794,12 @@@ static int btrfs_create(struct inode *d
  	inode = btrfs_new_inode(trans, root, dir, dentry->d_name.name,
  				dentry->d_name.len, dir->i_ino, objectid,
  				BTRFS_I(dir)->block_group, mode, &index);
- 	err = PTR_ERR(inode);
- 	if (IS_ERR(inode))
+ 	if (IS_ERR(inode)) {
+ 		err = PTR_ERR(inode);
  		goto out_unlock;
+ 	}
  
 -	err = btrfs_init_inode_security(trans, inode, dir);
 +	err = btrfs_init_inode_security(trans, inode, dir, &dentry->d_name);
  	if (err) {
  		drop_inode = 1;
  		goto out_unlock;
@@@ -7273,11 -7280,12 +7278,12 @@@ static int btrfs_symlink(struct inode *
  				dentry->d_name.len, dir->i_ino, objectid,
  				BTRFS_I(dir)->block_group, S_IFLNK|S_IRWXUGO,
  				&index);
- 	err = PTR_ERR(inode);
- 	if (IS_ERR(inode))
+ 	if (IS_ERR(inode)) {
+ 		err = PTR_ERR(inode);
  		goto out_unlock;
+ 	}
  
 -	err = btrfs_init_inode_security(trans, inode, dir);
 +	err = btrfs_init_inode_security(trans, inode, dir, &dentry->d_name);
  	if (err) {
  		drop_inode = 1;
  		goto out_unlock;