From: Christoph Hellwig Date: Fri, 10 Feb 2023 07:48:41 +0000 (+0100) Subject: btrfs: fold finish_compressed_bio_write into btrfs_finish_compressed_write_work X-Git-Tag: v6.4-rc1~141^2~121 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9327a70c12c362b15c62b011332e22d242cf009;p=thirdparty%2Fkernel%2Flinux.git btrfs: fold finish_compressed_bio_write into btrfs_finish_compressed_write_work Fold finish_compressed_bio_write into its only caller as there is no reason to keep them separate. Reviewed-by: Johannes Thumshirn Signed-off-by: Christoph Hellwig Reviewed-by: David Sterba Signed-off-by: David Sterba --- diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index 6a23d6cc29aa6..5b1de1c19991e 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -220,8 +220,11 @@ static noinline void end_compressed_writeback(const struct compressed_bio *cb) /* the inode may be gone now */ } -static void finish_compressed_bio_write(struct compressed_bio *cb) +static void btrfs_finish_compressed_write_work(struct work_struct *work) { + struct compressed_bio *cb = + container_of(work, struct compressed_bio, write_end_work); + /* * Ok, we're the last bio for this extent, step one is to call back * into the FS and do all the end_io operations. @@ -238,14 +241,6 @@ static void finish_compressed_bio_write(struct compressed_bio *cb) bio_put(&cb->bbio.bio); } -static void btrfs_finish_compressed_write_work(struct work_struct *work) -{ - struct compressed_bio *cb = - container_of(work, struct compressed_bio, write_end_work); - - finish_compressed_bio_write(cb); -} - /* * Do the cleanup once all the compressed pages hit the disk. This will clear * writeback on the file pages and free the compressed pages.