btrfs: open code extent_set_compress_type helpers

The helpers extent_set_compress_type and extent_compress_type have
become trivial after previous cleanups and can be removed.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index ecb15732d67e5e2a056dd306997daeb2a62c894d..6c40eed217d62b72902c1536291e51688c5d64f0 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2562,7 +2562,7 @@ static struct io_failure_record *btrfs_get_io_failure_record(struct inode *inode
        logical = em->block_start + logical;
        if (test_bit(EXTENT_FLAG_COMPRESSED, &em->flags)) {
                logical = em->block_start;
-               extent_set_compress_type(&failrec->bio_flags, em->compress_type);
+               failrec->bio_flags = em->compress_type;
        }
 
        btrfs_debug(fs_info,
@@ -3681,10 +3681,8 @@ static int btrfs_do_readpage(struct page *page, struct extent_map **em_cached,
                BUG_ON(extent_map_end(em) <= cur);
                BUG_ON(end < cur);
 
-               if (test_bit(EXTENT_FLAG_COMPRESSED, &em->flags)) {
-                       extent_set_compress_type(&this_bio_flag,
-                                                em->compress_type);
-               }
+               if (test_bit(EXTENT_FLAG_COMPRESSED, &em->flags))
+                       this_bio_flag = em->compress_type;
 
                iosize = min(extent_map_end(em) - cur, end - cur + 1);
                cur_end = min(extent_map_end(em) - 1, end);

diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index ba793cb7a3a2ee9849d44cb61b012789c52dbb57..fdbfe801dbe2ae759399eaf87b5c2eebe969209f 100644 (file)
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -140,17 +140,6 @@ static inline void extent_changeset_free(struct extent_changeset *changeset)
        kfree(changeset);
 }
 
-static inline void extent_set_compress_type(unsigned long *bio_flags,
-                                           int compress_type)
-{
-       *bio_flags = compress_type;
-}
-
-static inline int extent_compress_type(unsigned long bio_flags)
-{
-       return bio_flags;
-}
-
 struct extent_map_tree;
 
 typedef struct extent_map *(get_extent_t)(struct btrfs_inode *inode,