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
btrfs: qgroup: Cleanup old inaccurate facilities
[firefly-linux-kernel-4.4.55.git]
/
fs
/
btrfs
/
file.c
diff --git
a/fs/btrfs/file.c
b/fs/btrfs/file.c
index 29b3702fe10d33813af07481a1bc7290ee986d43..47785c8a7d39068b75c4f37314970d8ea57c9e16 100644
(file)
--- a/
fs/btrfs/file.c
+++ b/
fs/btrfs/file.c
@@
-1529,7
+1529,7
@@
static noinline ssize_t __btrfs_buffered_write(struct file *file,
goto reserve_metadata;
}
}
goto reserve_metadata;
}
}
- ret =
__
btrfs_check_data_free_space(inode, pos, write_bytes);
+ ret = btrfs_check_data_free_space(inode, pos, write_bytes);
if (ret < 0)
break;
if (ret < 0)
break;
@@
-1537,8
+1537,8
@@
reserve_metadata:
ret = btrfs_delalloc_reserve_metadata(inode, reserve_bytes);
if (ret) {
if (!only_release_metadata)
ret = btrfs_delalloc_reserve_metadata(inode, reserve_bytes);
if (ret) {
if (!only_release_metadata)
-
__
btrfs_free_reserved_data_space(inode, pos,
-
write_bytes);
+ btrfs_free_reserved_data_space(inode, pos,
+ write_bytes);
else
btrfs_end_write_no_snapshoting(root);
break;
else
btrfs_end_write_no_snapshoting(root);
break;
@@
-1608,7
+1608,7
@@
again:
btrfs_delalloc_release_metadata(inode,
release_bytes);
else
btrfs_delalloc_release_metadata(inode,
release_bytes);
else
-
__
btrfs_delalloc_release_space(inode, pos,
+ btrfs_delalloc_release_space(inode, pos,
release_bytes);
}
release_bytes);
}
@@
-1661,8
+1661,7
@@
again:
btrfs_end_write_no_snapshoting(root);
btrfs_delalloc_release_metadata(inode, release_bytes);
} else {
btrfs_end_write_no_snapshoting(root);
btrfs_delalloc_release_metadata(inode, release_bytes);
} else {
- __btrfs_delalloc_release_space(inode, pos,
- release_bytes);
+ btrfs_delalloc_release_space(inode, pos, release_bytes);
}
}
}
}
@@
-2708,8
+2707,8
@@
static long btrfs_fallocate(struct file *file, int mode,
out:
mutex_unlock(&inode->i_mutex);
/* Let go of our reservation. */
out:
mutex_unlock(&inode->i_mutex);
/* Let go of our reservation. */
-
__
btrfs_free_reserved_data_space(inode, alloc_start,
-
alloc_end - alloc_start);
+ btrfs_free_reserved_data_space(inode, alloc_start,
+ alloc_end - alloc_start);
return ret;
}
return ret;
}