Commit 378f25d3 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: move btrfs_alloc_write_mask() into fs.h 



Currently btrfs_alloc_write_mask() is defined in ctree.h but it's not
related at all to the btree data structure, so move it into fs.h.

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent a4545b74

fs/btrfs/ctree.h

+0 −6
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#define BTRFS_CTREE_H



#include "linux/cleanup.h"

#include <linux/pagemap.h>

#include <linux/spinlock.h>

#include <linux/rbtree.h>

#include <linux/mutex.h>
@@ -506,11 +505,6 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(const struct btrfs_fs_info *info) 
	return BTRFS_MAX_ITEM_SIZE(info) - sizeof(struct btrfs_dir_item);

}



static inline gfp_t btrfs_alloc_write_mask(struct address_space *mapping)

{

	return mapping_gfp_constraint(mapping, ~__GFP_FS);

}



void btrfs_error_unpin_extent_range(struct btrfs_fs_info *fs_info, u64 start, u64 end);

int btrfs_discard_extent(struct btrfs_fs_info *fs_info, u64 bytenr,

			 u64 num_bytes, u64 *actual_bytes);

fs/btrfs/fs.h

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/rwsem.h>

#include <linux/semaphore.h>

#include <linux/list.h>

#include <linux/pagemap.h>

#include <linux/radix-tree.h>

#include <linux/workqueue.h>

#include <linux/wait.h>
@@ -887,6 +888,11 @@ struct btrfs_fs_info { 
#define inode_to_fs_info(_inode) (BTRFS_I(_Generic((_inode),			\

					   struct inode *: (_inode)))->root->fs_info)



static inline gfp_t btrfs_alloc_write_mask(struct address_space *mapping)

{

	return mapping_gfp_constraint(mapping, ~__GFP_FS);

}



static inline u64 btrfs_get_fs_generation(const struct btrfs_fs_info *fs_info)

{

	return READ_ONCE(fs_info->generation);