diff options
| author | Liu Bo <liubo2009@cn.fujitsu.com> | 2012-07-10 13:28:38 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2012-07-23 22:28:00 +0200 |
| commit | 51a8cf9d2d97017d334f33f1b39067bd2f03bc49 (patch) | |
| tree | a80be16062c2f5ff10d766852cf9d79a852aa0ef /fs/btrfs/btrfs_inode.h | |
| parent | Btrfs: avoid I/O repair BUG() from btree_read_extent_buffer_pages() (diff) | |
| download | linux-51a8cf9d2d97017d334f33f1b39067bd2f03bc49.tar.xz linux-51a8cf9d2d97017d334f33f1b39067bd2f03bc49.zip | |
Btrfs: fix btrfs_is_free_space_inode to recognize btree inode
For btree inode, its root is also 'tree root', so btree inode can be
misunderstood as a free space inode.
We should add one more check for btree inode.
Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/btrfs/btrfs_inode.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h index 12394a90d60f..b168238bcb13 100644 --- a/fs/btrfs/btrfs_inode.h +++ b/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; } |