From da9d7dc84421df16383ec3b00947686c296f9d8d Mon Sep 17 00:00:00 2001
From: Liu Bo <bo.li.liu@oracle.com>
Date: Mon, 25 Feb 2013 04:04:42 +0000
Subject: [PATCH] --- yaml --- r: 360486 b: refs/heads/master c:
 8c4ce81e911ab6c84e4f75e18d4ceb3fa555c35b h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/fs/btrfs/inode.c | 25 -------------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index bcd18f8def92..99d81b7ff7d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2382c5cc7ed0396b61a359765bf5ee125b0a2f46
+refs/heads/master: 8c4ce81e911ab6c84e4f75e18d4ceb3fa555c35b
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 14c82cdbb696..be09654e11b9 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -8060,29 +8060,6 @@ static int btrfs_getattr(struct vfsmount *mnt,
 	return 0;
 }
 
-/*
- * If a file is moved, it will inherit the cow and compression flags of the new
- * directory.
- */
-static void fixup_inode_flags(struct inode *dir, struct inode *inode)
-{
-	struct btrfs_inode *b_dir = BTRFS_I(dir);
-	struct btrfs_inode *b_inode = BTRFS_I(inode);
-
-	if (b_dir->flags & BTRFS_INODE_NODATACOW)
-		b_inode->flags |= BTRFS_INODE_NODATACOW;
-	else
-		b_inode->flags &= ~BTRFS_INODE_NODATACOW;
-
-	if (b_dir->flags & BTRFS_INODE_COMPRESS) {
-		b_inode->flags |= BTRFS_INODE_COMPRESS;
-		b_inode->flags &= ~BTRFS_INODE_NOCOMPRESS;
-	} else {
-		b_inode->flags &= ~(BTRFS_INODE_COMPRESS |
-				    BTRFS_INODE_NOCOMPRESS);
-	}
-}
-
 static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 			   struct inode *new_dir, struct dentry *new_dentry)
 {
@@ -8248,8 +8225,6 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 		}
 	}
 
-	fixup_inode_flags(new_dir, old_inode);
-
 	ret = btrfs_add_link(trans, new_dir, old_inode,
 			     new_dentry->d_name.name,
 			     new_dentry->d_name.len, 0, index);