Skip to content

Commit 04cc63d

Browse files
josefbacikkdave
authored andcommitted
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: Johannes Thumshirn <johannes.thumshirn@wdc.com> Signed-off-by: Josef Bacik <josef@toxicpanda.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 3ecb43c commit 04cc63d

File tree

4 files changed

+6
-0
lines changed

4 files changed

+6
-0
lines changed

fs/btrfs/btrfs_inode.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#include <linux/hash.h>
1010
#include <linux/refcount.h>
11+
#include <linux/fscrypt.h>
1112
#include "extent_map.h"
1213
#include "extent_io.h"
1314
#include "ordered-data.h"

fs/btrfs/dir-item.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
#include <linux/crc32c.h>
77

8+
struct fscrypt_str;
9+
810
int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,
911
const struct fscrypt_str *name);
1012
int btrfs_insert_dir_item(struct btrfs_trans_handle *trans,

fs/btrfs/inode-item.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ struct btrfs_key;
1313
struct btrfs_inode_extref;
1414
struct btrfs_inode;
1515
struct extent_buffer;
16+
struct fscrypt_str;
1617

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

fs/btrfs/root-tree.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
#ifndef BTRFS_ROOT_TREE_H
44
#define BTRFS_ROOT_TREE_H
55

6+
struct fscrypt_str;
7+
68
int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
79
struct btrfs_block_rsv *rsv,
810
int nitems, bool use_global_rsv);

0 commit comments

Comments
 (0)