Skip to content

Commit

Permalink
btrfs: add fscrypt related dependencies to respective headers
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
josefbacik authored and kdave committed Oct 12, 2023
1 parent 3ecb43c commit 04cc63d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions fs/btrfs/btrfs_inode.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions fs/btrfs/dir-item.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions fs/btrfs/inode-item.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions fs/btrfs/root-tree.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 04cc63d

Please sign in to comment.