diff options
| author | Chris Mason <clm@fb.com> | 2016-01-19 18:21:30 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-01-19 18:21:30 -0800 |
| commit | 326f784281fbbdcd91bb401b2a3e32132c0f5c72 (patch) | |
| tree | ebee8e2cf51dd901d8c31b88e1a93b1655e6abf4 /fs/btrfs/inode-map.c | |
| parent | acc308556c812485462b6b43843c3f64530dd843 (diff) | |
| parent | 546bed631203344611f42b2af1d224d2eedb4e6b (diff) | |
| download | linux-stable-326f784281fbbdcd91bb401b2a3e32132c0f5c72.tar.gz linux-stable-326f784281fbbdcd91bb401b2a3e32132c0f5c72.tar.bz2 linux-stable-326f784281fbbdcd91bb401b2a3e32132c0f5c72.zip | |
Merge branch 'misc-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.5
Diffstat (limited to 'fs/btrfs/inode-map.c')
| -rw-r--r-- | fs/btrfs/inode-map.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c index 8b57c17b3fb3..e50316c4af15 100644 --- a/fs/btrfs/inode-map.c +++ b/fs/btrfs/inode-map.c @@ -515,7 +515,7 @@ out: return ret; } -static int btrfs_find_highest_objectid(struct btrfs_root *root, u64 *objectid) +int btrfs_find_highest_objectid(struct btrfs_root *root, u64 *objectid) { struct btrfs_path *path; int ret; @@ -555,13 +555,6 @@ int btrfs_find_free_objectid(struct btrfs_root *root, u64 *objectid) int ret; mutex_lock(&root->objectid_mutex); - if (unlikely(root->highest_objectid < BTRFS_FIRST_FREE_OBJECTID)) { - ret = btrfs_find_highest_objectid(root, - &root->highest_objectid); - if (ret) - goto out; - } - if (unlikely(root->highest_objectid >= BTRFS_LAST_FREE_OBJECTID)) { ret = -ENOSPC; goto out; |