From 68d39a149412a5e3a7733292dc9dfa54356502a0 Mon Sep 17 00:00:00 2001 From: Liu Bo Date: Tue, 10 Jul 2012 05:28:38 -0600 Subject: [PATCH] --- yaml --- r: 318851 b: refs/heads/master c: 51a8cf9d2d97017d334f33f1b39067bd2f03bc49 h: refs/heads/master i: 318849: 23967625c4960ce767240c1a2f2bbd90c973c3ef 318847: 3f1e945a183d42f15745834051bb2f5f2e4ae266 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/btrfs_inode.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 76be83354662..cc3bbcf94e81 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0901581ad077004145c9ee80e843fba71c100b8 +refs/heads/master: 51a8cf9d2d97017d334f33f1b39067bd2f03bc49 diff --git a/trunk/fs/btrfs/btrfs_inode.h b/trunk/fs/btrfs/btrfs_inode.h index 12394a90d60f..b168238bcb13 100644 --- a/trunk/fs/btrfs/btrfs_inode.h +++ b/trunk/fs/btrfs/btrfs_inode.h @@ -194,8 +194,10 @@ static inline void btrfs_i_size_write(struct inode *inode, u64 size) static inline bool btrfs_is_free_space_inode(struct btrfs_root *root, struct inode *inode) { - if (root == root->fs_info->tree_root || - BTRFS_I(inode)->location.objectid == BTRFS_FREE_INO_OBJECTID) + if (root == root->fs_info->tree_root && + btrfs_ino(inode) != BTRFS_BTREE_INODE_OBJECTID) + return true; + if (BTRFS_I(inode)->location.objectid == BTRFS_FREE_INO_OBJECTID) return true; return false; }