projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v4.4/topic/hibernate' into linux-linaro-lsk-v4.4
[firefly-linux-kernel-4.4.55.git]
/
fs
/
btrfs
/
inode-map.c
diff --git
a/fs/btrfs/inode-map.c
b/fs/btrfs/inode-map.c
index 767a6056ac45afce29844e469f582baec8ef28cd..07573dc1614abfcce4e290850bf80149c2e5cf17 100644
(file)
--- a/
fs/btrfs/inode-map.c
+++ b/
fs/btrfs/inode-map.c
@@
-515,7
+515,7
@@
out:
return ret;
}
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;
{
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);
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;
if (unlikely(root->highest_objectid >= BTRFS_LAST_FREE_OBJECTID)) {
ret = -ENOSPC;
goto out;