Commit 04cc63d1 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: add fscrypt related dependencies to respective headers 



These headers have struct fscrypt_str as function arguments, so add
struct fscrypt_str to the theader, and include linux/fscrypt.h in
btrfs_inode.h as it also needs the definition of struct fscrypt_name for
the new inode args.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 3ecb43cb

fs/btrfs/btrfs_inode.h

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include <linux/hash.h>

#include <linux/refcount.h>

#include <linux/fscrypt.h>

#include "extent_map.h"

#include "extent_io.h"

#include "ordered-data.h"

fs/btrfs/dir-item.h

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 


#include <linux/crc32c.h>



struct fscrypt_str;



int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,

			  const struct fscrypt_str *name);

int btrfs_insert_dir_item(struct btrfs_trans_handle *trans,

fs/btrfs/inode-item.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ struct btrfs_key; 
struct btrfs_inode_extref;

struct btrfs_inode;

struct extent_buffer;

struct fscrypt_str;



/*

 * Return this if we need to call truncate_block for the last bit of the

fs/btrfs/root-tree.h

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
#ifndef BTRFS_ROOT_TREE_H

#define BTRFS_ROOT_TREE_H



struct fscrypt_str;



int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,

				     struct btrfs_block_rsv *rsv,

				     int nitems, bool use_global_rsv);