leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

btrfs: new define for the inline extent data start

Browse Source 
Use a common definition for the inline data start so we don't have to
open-code it and introduce bugs like "Btrfs: fix wrong max inline data
size limit" fixed.

Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
David Sterba 2014-07-24 17:34:58 +02:00
parent fb85fc9a67
commit 7ec20afbcb
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/btrfs/ctree.c
View File

@ -4625,8 +4625,7 @@ void btrfs_truncate_item(struct btrfs_root *root, struct btrfs_path *path,
ptr = btrfs_item_ptr_offset(leaf, slot); ptr = btrfs_item_ptr_offset(leaf, slot);
memmove_extent_buffer(leaf, ptr, memmove_extent_buffer(leaf, ptr,
(unsigned long)fi, (unsigned long)fi,
offsetof(struct btrfs_file_extent_item, BTRFS_FILE_EXTENT_INLINE_DATA_START);
disk_bytenr));
} }
} }

16
fs/btrfs/ctree.h
View File

@ -385,9 +385,11 @@ struct btrfs_header {
sizeof(struct btrfs_key_ptr)) sizeof(struct btrfs_key_ptr))
#define __BTRFS_LEAF_DATA_SIZE(bs) ((bs) - sizeof(struct btrfs_header)) #define __BTRFS_LEAF_DATA_SIZE(bs) ((bs) - sizeof(struct btrfs_header))
#define BTRFS_LEAF_DATA_SIZE(r) (__BTRFS_LEAF_DATA_SIZE(r->nodesize)) #define BTRFS_LEAF_DATA_SIZE(r) (__BTRFS_LEAF_DATA_SIZE(r->nodesize))
#define BTRFS_FILE_EXTENT_INLINE_DATA_START \
(offsetof(struct btrfs_file_extent_item, disk_bytenr))
#define BTRFS_MAX_INLINE_DATA_SIZE(r) (BTRFS_LEAF_DATA_SIZE(r) - \ #define BTRFS_MAX_INLINE_DATA_SIZE(r) (BTRFS_LEAF_DATA_SIZE(r) - \
sizeof(struct btrfs_item) - \ sizeof(struct btrfs_item) - \
offsetof(struct btrfs_file_extent_item, disk_bytenr)) BTRFS_FILE_EXTENT_INLINE_DATA_START)
#define BTRFS_MAX_XATTR_SIZE(r) (BTRFS_LEAF_DATA_SIZE(r) - \ #define BTRFS_MAX_XATTR_SIZE(r) (BTRFS_LEAF_DATA_SIZE(r) - \
sizeof(struct btrfs_item) -\ sizeof(struct btrfs_item) -\
sizeof(struct btrfs_dir_item)) sizeof(struct btrfs_dir_item))
@ -896,6 +898,8 @@ struct btrfs_file_extent_item {
/* /*
* disk space consumed by the extent, checksum blocks are included * disk space consumed by the extent, checksum blocks are included
* in these numbers * in these numbers
*
* At this offset in the structure, the inline extent data start.
*/ */
__le64 disk_bytenr; __le64 disk_bytenr;
__le64 disk_num_bytes; __le64 disk_num_bytes;
@ -3043,14 +3047,12 @@ BTRFS_SETGET_STACK_FUNCS(stack_file_extent_compression,
static inline unsigned long static inline unsigned long
btrfs_file_extent_inline_start(struct btrfs_file_extent_item *e) btrfs_file_extent_inline_start(struct btrfs_file_extent_item *e)
{ {
unsigned long offset = (unsigned long)e; return (unsigned long)e + BTRFS_FILE_EXTENT_INLINE_DATA_START;
offset += offsetof(struct btrfs_file_extent_item, disk_bytenr);
return offset;
} }
static inline u32 btrfs_file_extent_calc_inline_size(u32 datasize) static inline u32 btrfs_file_extent_calc_inline_size(u32 datasize)
{ {
return offsetof(struct btrfs_file_extent_item, disk_bytenr) + datasize; return BTRFS_FILE_EXTENT_INLINE_DATA_START + datasize;
} }
BTRFS_SETGET_FUNCS(file_extent_disk_bytenr, struct btrfs_file_extent_item, BTRFS_SETGET_FUNCS(file_extent_disk_bytenr, struct btrfs_file_extent_item,
@ -3080,9 +3082,7 @@ BTRFS_SETGET_FUNCS(file_extent_other_encoding, struct btrfs_file_extent_item,
static inline u32 btrfs_file_extent_inline_item_len(struct extent_buffer *eb, static inline u32 btrfs_file_extent_inline_item_len(struct extent_buffer *eb,
struct btrfs_item *e) struct btrfs_item *e)
{ {
unsigned long offset; return btrfs_item_size(eb, e) - BTRFS_FILE_EXTENT_INLINE_DATA_START;
offset = offsetof(struct btrfs_file_extent_item, disk_bytenr);
return btrfs_item_size(eb, e) - offset;
} }
/* this returns the number of file bytes represented by the inline item. /* this returns the number of file bytes represented by the inline item.