public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-27 01:11:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: rename submit callbacks and drop double underscores

Browse source 
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2018-03-08 14:35:48 +01:00
parent 6c55343587
commit d0ee393493
2 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/btrfs/disk-io.c
View file

@ -797,7 +797,7 @@ static blk_status_t btree_csum_one_bio(struct bio *bio)
return errno_to_blk_status(ret); return errno_to_blk_status(ret);
} }
static blk_status_t __btree_submit_bio_start(void *private_data, struct bio *bio, static blk_status_t btree_submit_bio_start(void *private_data, struct bio *bio,
u64 bio_offset) u64 bio_offset)
{ {
/* /*
@ -807,7 +807,7 @@ static blk_status_t __btree_submit_bio_start(void *private_data, struct bio *bio
return btree_csum_one_bio(bio); return btree_csum_one_bio(bio);
} }
static blk_status_t __btree_submit_bio_done(void *private_data, struct bio *bio, static blk_status_t btree_submit_bio_done(void *private_data, struct bio *bio,
int mirror_num) int mirror_num)
{ {
struct inode *inode = private_data; struct inode *inode = private_data;
@ -867,8 +867,8 @@ static blk_status_t btree_submit_bio_hook(void *private_data, struct bio *bio,
*/ */
ret = btrfs_wq_submit_bio(fs_info, bio, mirror_num, 0, ret = btrfs_wq_submit_bio(fs_info, bio, mirror_num, 0,
bio_offset, private_data, bio_offset, private_data,
__btree_submit_bio_start, btree_submit_bio_start,
__btree_submit_bio_done); btree_submit_bio_done);
} }
if (ret) if (ret)

23
fs/btrfs/inode.c
View file

@ -1941,7 +1941,7 @@ int btrfs_merge_bio_hook(struct page *page, unsigned long offset,
* At IO completion time the cums attached on the ordered extent record * At IO completion time the cums attached on the ordered extent record
* are inserted into the btree * are inserted into the btree
*/ */
static blk_status_t __btrfs_submit_bio_start(void *private_data, struct bio *bio, static blk_status_t btrfs_submit_bio_start(void *private_data, struct bio *bio,
u64 bio_offset) u64 bio_offset)
{ {
struct inode *inode = private_data; struct inode *inode = private_data;
@ -1960,7 +1960,7 @@ static blk_status_t __btrfs_submit_bio_start(void *private_data, struct bio *bio
* At IO completion time the cums attached on the ordered extent record * At IO completion time the cums attached on the ordered extent record
* are inserted into the btree * are inserted into the btree
*/ */
static blk_status_t __btrfs_submit_bio_done(void *private_data, struct bio *bio, static blk_status_t btrfs_submit_bio_done(void *private_data, struct bio *bio,
int mirror_num) int mirror_num)
{ {
struct inode *inode = private_data; struct inode *inode = private_data;
@ -2033,8 +2033,8 @@ static blk_status_t btrfs_submit_bio_hook(void *private_data, struct bio *bio,
/* we're doing a write, do the async checksumming */ /* we're doing a write, do the async checksumming */
ret = btrfs_wq_submit_bio(fs_info, bio, mirror_num, bio_flags, ret = btrfs_wq_submit_bio(fs_info, bio, mirror_num, bio_flags,
bio_offset, inode, bio_offset, inode,
__btrfs_submit_bio_start, btrfs_submit_bio_start,
__btrfs_submit_bio_done); btrfs_submit_bio_done);
goto out; goto out;
} else if (!skip_sum) { } else if (!skip_sum) {
ret = btrfs_csum_one_bio(inode, bio, 0, 0); ret = btrfs_csum_one_bio(inode, bio, 0, 0);
@ -8219,7 +8219,7 @@ static void btrfs_endio_direct_write(struct bio *bio)
bio_put(bio); bio_put(bio);
} }
static blk_status_t __btrfs_submit_bio_start_direct_io(void *private_data, static blk_status_t btrfs_submit_bio_start_direct_io(void *private_data,
struct bio *bio, u64 offset) struct bio *bio, u64 offset)
{ {
struct inode *inode = private_data; struct inode *inode = private_data;
@ -8300,9 +8300,8 @@ static inline blk_status_t btrfs_lookup_and_bind_dio_csum(struct inode *inode,
return 0; return 0;
} }
static inline blk_status_t static inline blk_status_t btrfs_submit_dio_bio(struct bio *bio,
__btrfs_submit_dio_bio(struct bio *bio, struct inode *inode, u64 file_offset, struct inode *inode, u64 file_offset, int async_submit)
int async_submit)
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
struct btrfs_dio_private *dip = bio->bi_private; struct btrfs_dio_private *dip = bio->bi_private;
@ -8325,8 +8324,8 @@ __btrfs_submit_dio_bio(struct bio *bio, struct inode *inode, u64 file_offset,
if (write && async_submit) { if (write && async_submit) {
ret = btrfs_wq_submit_bio(fs_info, bio, 0, 0, ret = btrfs_wq_submit_bio(fs_info, bio, 0, 0,
file_offset, inode, file_offset, inode,
__btrfs_submit_bio_start_direct_io, btrfs_submit_bio_start_direct_io,
__btrfs_submit_bio_done); btrfs_submit_bio_done);
goto err; goto err;
} else if (write) { } else if (write) {
/* /*
@ -8412,7 +8411,7 @@ static int btrfs_submit_direct_hook(struct btrfs_dio_private *dip)
*/ */
atomic_inc(&dip->pending_bios); atomic_inc(&dip->pending_bios);
status = __btrfs_submit_dio_bio(bio, inode, file_offset, status = btrfs_submit_dio_bio(bio, inode, file_offset,
async_submit); async_submit);
if (status) { if (status) {
bio_put(bio); bio_put(bio);
@ -8432,7 +8431,7 @@ static int btrfs_submit_direct_hook(struct btrfs_dio_private *dip)
} while (submit_len > 0); } while (submit_len > 0);
submit: submit:
status = __btrfs_submit_dio_bio(bio, inode, file_offset, async_submit); status = btrfs_submit_dio_bio(bio, inode, file_offset, async_submit);
if (!status) if (!status)
return 0; return 0;