diff options
author | Qu Wenruo <quwenruo@cn.fujitsu.com> | 2015-09-08 05:25:55 -0400 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2015-10-21 21:41:06 -0400 |
commit | 7cf5b97650f2ecefbd5afa2d58b61b289b6e3750 (patch) | |
tree | 65bdb57078053527218338c59e4e34057d3206d1 /fs/btrfs/ioctl.c | |
parent | df480633b891cf03301d87e56024a8ec3251da5b (diff) |
btrfs: qgroup: Cleanup old inaccurate facilities
Cleanup the old facilities which use old btrfs_qgroup_reserve() function
call, replace them with the newer version, and remove the "__" prefix in
them.
Also, make btrfs_qgroup_reserve/free() functions private, as they are
now only used inside qgroup codes.
Now, the whole btrfs qgroup is swithed to use the new reserve facilities.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r-- | fs/btrfs/ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 70732e629b0f..7ed033a84212 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
@@ -1119,7 +1119,7 @@ static int cluster_pages_for_defrag(struct inode *inode, | |||
1119 | 1119 | ||
1120 | page_cnt = min_t(u64, (u64)num_pages, (u64)file_end - start_index + 1); | 1120 | page_cnt = min_t(u64, (u64)num_pages, (u64)file_end - start_index + 1); |
1121 | 1121 | ||
1122 | ret = __btrfs_delalloc_reserve_space(inode, | 1122 | ret = btrfs_delalloc_reserve_space(inode, |
1123 | start_index << PAGE_CACHE_SHIFT, | 1123 | start_index << PAGE_CACHE_SHIFT, |
1124 | page_cnt << PAGE_CACHE_SHIFT); | 1124 | page_cnt << PAGE_CACHE_SHIFT); |
1125 | if (ret) | 1125 | if (ret) |
@@ -1210,7 +1210,7 @@ again: | |||
1210 | spin_lock(&BTRFS_I(inode)->lock); | 1210 | spin_lock(&BTRFS_I(inode)->lock); |
1211 | BTRFS_I(inode)->outstanding_extents++; | 1211 | BTRFS_I(inode)->outstanding_extents++; |
1212 | spin_unlock(&BTRFS_I(inode)->lock); | 1212 | spin_unlock(&BTRFS_I(inode)->lock); |
1213 | __btrfs_delalloc_release_space(inode, | 1213 | btrfs_delalloc_release_space(inode, |
1214 | start_index << PAGE_CACHE_SHIFT, | 1214 | start_index << PAGE_CACHE_SHIFT, |
1215 | (page_cnt - i_done) << PAGE_CACHE_SHIFT); | 1215 | (page_cnt - i_done) << PAGE_CACHE_SHIFT); |
1216 | } | 1216 | } |
@@ -1237,7 +1237,7 @@ out: | |||
1237 | unlock_page(pages[i]); | 1237 | unlock_page(pages[i]); |
1238 | page_cache_release(pages[i]); | 1238 | page_cache_release(pages[i]); |
1239 | } | 1239 | } |
1240 | __btrfs_delalloc_release_space(inode, | 1240 | btrfs_delalloc_release_space(inode, |
1241 | start_index << PAGE_CACHE_SHIFT, | 1241 | start_index << PAGE_CACHE_SHIFT, |
1242 | page_cnt << PAGE_CACHE_SHIFT); | 1242 | page_cnt << PAGE_CACHE_SHIFT); |
1243 | return ret; | 1243 | return ret; |