Commit 1b9e6a15 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba

btrfs: move btrfs_name_hash to dir-item.h

This is related to the name hashing for dir items, move it into
dir-item.h.
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarAnand Jain <anand.jain@oracle.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 98e4f060
...@@ -470,11 +470,6 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(const struct btrfs_fs_info *info) ...@@ -470,11 +470,6 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(const struct btrfs_fs_info *info)
#define BTRFS_BYTES_TO_BLKS(fs_info, bytes) \ #define BTRFS_BYTES_TO_BLKS(fs_info, bytes) \
((bytes) >> (fs_info)->sectorsize_bits) ((bytes) >> (fs_info)->sectorsize_bits)
static inline u64 btrfs_name_hash(const char *name, int len)
{
return crc32c((u32)~1, name, len);
}
static inline gfp_t btrfs_alloc_write_mask(struct address_space *mapping) static inline gfp_t btrfs_alloc_write_mask(struct address_space *mapping)
{ {
return mapping_gfp_constraint(mapping, ~__GFP_FS); return mapping_gfp_constraint(mapping, ~__GFP_FS);
......
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
#ifndef BTRFS_DIR_ITEM_H #ifndef BTRFS_DIR_ITEM_H
#define BTRFS_DIR_ITEM_H #define BTRFS_DIR_ITEM_H
#include <linux/crc32c.h>
int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir, int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,
const struct fscrypt_str *name); const struct fscrypt_str *name);
int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, int btrfs_insert_dir_item(struct btrfs_trans_handle *trans,
...@@ -39,4 +41,9 @@ struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_fs_info *fs_info, ...@@ -39,4 +41,9 @@ struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_fs_info *fs_info,
const char *name, const char *name,
int name_len); int name_len);
static inline u64 btrfs_name_hash(const char *name, int len)
{
return crc32c((u32)~1, name, len);
}
#endif #endif
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "fs.h" #include "fs.h"
#include "accessors.h" #include "accessors.h"
#include "super.h" #include "super.h"
#include "dir-item.h"
#define BTRFS_PROP_HANDLERS_HT_BITS 8 #define BTRFS_PROP_HANDLERS_HT_BITS 8
static DEFINE_HASHTABLE(prop_handlers_ht, BTRFS_PROP_HANDLERS_HT_BITS); static DEFINE_HASHTABLE(prop_handlers_ht, BTRFS_PROP_HANDLERS_HT_BITS);
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "accessors.h" #include "accessors.h"
#include "file-item.h" #include "file-item.h"
#include "inode-item.h" #include "inode-item.h"
#include "dir-item.h"
/* /*
* Error message should follow the following format: * Error message should follow the following format:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment