diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-21 03:48:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-21 03:48:33 -0400 |
| commit | f70cac8d9c7125f83048f8b3d1c60f5a041a165c (patch) | |
| tree | 0d0efd72c1a41f973a919b16aac1d8210ed1ee30 /fs/btrfs/btrfs_inode.h | |
| parent | 4722cd7741c6404f967f7a7b8b666540b6c1663e (diff) | |
| parent | 08aab447c56a5388cf0c768da476ad022f00fef8 (diff) | |
Merge branch 'kprobes-test' of git://git.yxit.co.uk/linux into devel-stable
Diffstat (limited to 'fs/btrfs/btrfs_inode.h')
| -rw-r--r-- | fs/btrfs/btrfs_inode.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h index 502b9e988679..d9f99a16edd6 100644 --- a/fs/btrfs/btrfs_inode.h +++ b/fs/btrfs/btrfs_inode.h | |||
| @@ -176,7 +176,11 @@ static inline u64 btrfs_ino(struct inode *inode) | |||
| 176 | { | 176 | { |
| 177 | u64 ino = BTRFS_I(inode)->location.objectid; | 177 | u64 ino = BTRFS_I(inode)->location.objectid; |
| 178 | 178 | ||
| 179 | if (ino <= BTRFS_FIRST_FREE_OBJECTID) | 179 | /* |
| 180 | * !ino: btree_inode | ||
| 181 | * type == BTRFS_ROOT_ITEM_KEY: subvol dir | ||
| 182 | */ | ||
| 183 | if (!ino || BTRFS_I(inode)->location.type == BTRFS_ROOT_ITEM_KEY) | ||
| 180 | ino = inode->i_ino; | 184 | ino = inode->i_ino; |
| 181 | return ino; | 185 | return ino; |
| 182 | } | 186 | } |