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

btrfs: move dir-item prototypes into dir-item.h 



Move these prototypes out of ctree.h and into their own header file.

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 59b818e0

fs/btrfs/ctree.h

+0 −38
Original line number Diff line number Diff line
@@ -689,44 +689,6 @@ int btrfs_uuid_tree_remove(struct btrfs_trans_handle *trans, u8 *uuid, u8 type, 
			u64 subid);

int btrfs_uuid_tree_iterate(struct btrfs_fs_info *fs_info);



/* dir-item.c */

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,

			  const struct fscrypt_str *name, struct btrfs_inode *dir,

			  struct btrfs_key *location, u8 type, u64 index);

struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans,

					     struct btrfs_root *root,

					     struct btrfs_path *path, u64 dir,

					     const struct fscrypt_str *name, int mod);

struct btrfs_dir_item *

btrfs_lookup_dir_index_item(struct btrfs_trans_handle *trans,

			    struct btrfs_root *root,

			    struct btrfs_path *path, u64 dir,

			    u64 index, const struct fscrypt_str *name, int mod);

struct btrfs_dir_item *

btrfs_search_dir_index_item(struct btrfs_root *root,

			    struct btrfs_path *path, u64 dirid,

			    const struct fscrypt_str *name);

int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans,

			      struct btrfs_root *root,

			      struct btrfs_path *path,

			      struct btrfs_dir_item *di);

int btrfs_insert_xattr_item(struct btrfs_trans_handle *trans,

			    struct btrfs_root *root,

			    struct btrfs_path *path, u64 objectid,

			    const char *name, u16 name_len,

			    const void *data, u16 data_len);

struct btrfs_dir_item *btrfs_lookup_xattr(struct btrfs_trans_handle *trans,

					  struct btrfs_root *root,

					  struct btrfs_path *path, u64 dir,

					  const char *name, u16 name_len,

					  int mod);

struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_fs_info *fs_info,

						 struct btrfs_path *path,

						 const char *name,

						 int name_len);



/* orphan.c */

int btrfs_insert_orphan_item(struct btrfs_trans_handle *trans,

			     struct btrfs_root *root, u64 offset);

fs/btrfs/dir-item.c

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include "disk-io.h"

#include "transaction.h"

#include "accessors.h"

#include "dir-item.h"



/*

 * insert a name into a directory, doing overflow properly if there is a hash

fs/btrfs/dir-item.h

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#ifndef BTRFS_DIR_ITEM_H

#define BTRFS_DIR_ITEM_H



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,

			  const struct fscrypt_str *name, struct btrfs_inode *dir,

			  struct btrfs_key *location, u8 type, u64 index);

struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans,

					     struct btrfs_root *root,

					     struct btrfs_path *path, u64 dir,

					     const struct fscrypt_str *name, int mod);

struct btrfs_dir_item *btrfs_lookup_dir_index_item(

			struct btrfs_trans_handle *trans,

			struct btrfs_root *root,

			struct btrfs_path *path, u64 dir,

			u64 index, const struct fscrypt_str *name, int mod);

struct btrfs_dir_item *btrfs_search_dir_index_item(struct btrfs_root *root,

			    struct btrfs_path *path, u64 dirid,

			    const struct fscrypt_str *name);

int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans,

			      struct btrfs_root *root,

			      struct btrfs_path *path,

			      struct btrfs_dir_item *di);

int btrfs_insert_xattr_item(struct btrfs_trans_handle *trans,

			    struct btrfs_root *root,

			    struct btrfs_path *path, u64 objectid,

			    const char *name, u16 name_len,

			    const void *data, u16 data_len);

struct btrfs_dir_item *btrfs_lookup_xattr(struct btrfs_trans_handle *trans,

					  struct btrfs_root *root,

					  struct btrfs_path *path, u64 dir,

					  const char *name, u16 name_len,

					  int mod);

struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_fs_info *fs_info,

						 struct btrfs_path *path,

						 const char *name,

						 int name_len);



#endif

fs/btrfs/inode.c

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include "extent-tree.h"

#include "root-tree.h"

#include "defrag.h"

#include "dir-item.h"



struct btrfs_iget_args {

	u64 ino;

fs/btrfs/ioctl.c

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
#include "extent-tree.h"

#include "root-tree.h"

#include "defrag.h"

#include "dir-item.h"



#ifdef CONFIG_64BIT

/* If we have a 32-bit userspace and 64-bit kernel, then the UAPI