btrfs: split out larger chunks of ctree.h
v3 cover btrfs: split out larger chunks of ctree.h
v2->v3:
- Merged the moving of the printk helpers out of ctree.h and then moving some of the larger helpers into their own c file into one patch.
- Moved the assert helper patch to before the printk moving patch so I don't move the code twice.
- Adjusted the commit log to indicate I was un-inlining the btrfs_map_token_init funciton.
- Added some missing newlines at the end of headers.
v1->v2:
- renamed btrfs-printk.h and item-accessors.* to messages.h and accessors.*.
- I dropped "btrfs: push extra checks into __btrfs_abort_transaction" so the WARN_ON would be where the abort happens.
- I reworked the incompat/compat get helpers to be defines instead of inlines to maintain the faster code instead of un-inlining the helper, and this way we have a little better header cleanliness.
- I gave up on my idea of having headers able to be included at any order at this point and made sure everything was included in the proper order. Once things are completely split out we can go back through and try to make all the header files as clean as possible.
--- Original email ---
Hello,
This series is based on the series
btrfs: initial ctree.h cleanups, simple stuff
which needs to be in place before applying these patches.
This is likely going to have the largest patch of the series, which bulk moves all of the struct funcs defines out of ctree.h into their own file. This isn't really possible to do piecemeal like other changes because we're using macros instead of functions. However the code is well organized so it allows for a bulk copy and paste, so is straightforward.
I've done my best with naming, but I'm open to suggestions. My general plan is to have all fs wide definitions in fs.h, and then separate out individual things to their own headers.
The biggest things I've done in this series are
1. Move the printk helpers into their own files.
2. Move the main state flags and core fs helpers into their own files.
3. Moved the struct func definitions to their own files.
This is by no means complete, this is just the first big pass, but as you can see is already 17 patches long. Subsequent patches will move more code and do more cleanups. Thanks,
Josef
Josef Bacik (15):
btrfs: move fs wide helpers out of ctree.h
btrfs: move assert helpers out of ctree.h
btrfs: move the printk helpers out of ctree.h
btrfs: push printk index code into their respective helpers
btrfs: move BTRFS_FS_STATE* defs and helpers to fs.h
btrfs: convert incompat and compat flag test helpers to defines
btrfs: move mount option definitions to fs.h
btrfs: move fs_info->flags enum to fs.h
btrfs: add a BTRFS_FS_NEED_TRANS_COMMIT flag
btrfs: remove fs_info::pending_changes and related code
btrfs: move the compat/incompat flag masks to fs.h
btrfs: rename struct-funcs.c -> accessors.c
btrfs: move btrfs_map_token to accessors
btrfs: move accessor helpers into accessors.h
btrfs: remove temporary btrfs_map_token declaration in ctree.h
fs/btrfs/Makefile | 4 +-
fs/btrfs/{struct-funcs.c => accessors.c} | 10 +
fs/btrfs/accessors.h | 1105 ++++++++++++++
fs/btrfs/backref.c | 2 +
fs/btrfs/backref.h | 1 +
fs/btrfs/block-group.c | 2 +
fs/btrfs/block-rsv.c | 2 +
fs/btrfs/check-integrity.c | 2 +
fs/btrfs/compression.c | 1 +
fs/btrfs/ctree.c | 3 +
fs/btrfs/ctree.h | 1782 +---------------------
fs/btrfs/delalloc-space.c | 2 +
fs/btrfs/delayed-inode.c | 6 +-
fs/btrfs/delayed-ref.c | 2 +
fs/btrfs/dev-replace.c | 2 +
fs/btrfs/dir-item.c | 2 +
fs/btrfs/discard.c | 1 +
fs/btrfs/disk-io.c | 8 +-
fs/btrfs/export.c | 1 +
fs/btrfs/extent-io-tree.c | 1 +
fs/btrfs/extent-tree.c | 2 +
fs/btrfs/extent_io.c | 2 +
fs/btrfs/extent_map.c | 1 +
fs/btrfs/file-item.c | 3 +
fs/btrfs/file.c | 2 +
fs/btrfs/free-space-cache.c | 6 +-
fs/btrfs/free-space-tree.c | 3 +
fs/btrfs/fs.c | 94 ++
fs/btrfs/fs.h | 322 ++++
fs/btrfs/inode-item.c | 3 +
fs/btrfs/inode.c | 2 +
fs/btrfs/ioctl.c | 2 +
fs/btrfs/locking.c | 1 +
fs/btrfs/lzo.c | 1 +
fs/btrfs/messages.h | 229 +++
fs/btrfs/ordered-data.c | 1 +
fs/btrfs/print-tree.c | 2 +
fs/btrfs/props.c | 3 +
fs/btrfs/qgroup.c | 2 +
fs/btrfs/raid56.c | 1 +
fs/btrfs/ref-verify.c | 3 +
fs/btrfs/reflink.c | 5 +-
fs/btrfs/relocation.c | 2 +
fs/btrfs/root-tree.c | 4 +
fs/btrfs/scrub.c | 2 +
fs/btrfs/send.c | 1 +
fs/btrfs/space-info.c | 2 +
fs/btrfs/subpage.c | 1 +
fs/btrfs/super.c | 32 +-
fs/btrfs/sysfs.c | 7 +-
fs/btrfs/tests/btrfs-tests.c | 1 +
fs/btrfs/tests/extent-buffer-tests.c | 1 +
fs/btrfs/tests/free-space-tree-tests.c | 1 +
fs/btrfs/tests/inode-tests.c | 1 +
fs/btrfs/tests/qgroup-tests.c | 2 +
fs/btrfs/transaction.c | 29 +-
fs/btrfs/transaction.h | 1 -
fs/btrfs/tree-checker.c | 3 +
fs/btrfs/tree-defrag.c | 1 +
fs/btrfs/tree-log.c | 2 +
fs/btrfs/tree-log.h | 1 +
fs/btrfs/tree-mod-log.c | 3 +
fs/btrfs/ulist.c | 1 +
fs/btrfs/uuid-tree.c | 4 +-
fs/btrfs/verity.c | 3 +
fs/btrfs/volumes.c | 2 +
fs/btrfs/xattr.c | 3 +
fs/btrfs/zoned.c | 2 +
fs/btrfs/zoned.h | 1 +
69 files changed, 1919 insertions(+), 1823 deletions(-)
rename fs/btrfs/{struct-funcs.c => accessors.c} (96%)
create mode 100644 fs/btrfs/accessors.h
create mode 100644 fs/btrfs/fs.c
create mode 100644 fs/btrfs/fs.h
create mode 100644 fs/btrfs/messages.hSignature · 1 line
2.26.3
PATCH v3 1/15 btrfs: move fs wide helpers out of ctree.h
We have several fs wide related helpers in ctree.h. The bulk of these are the incompat flag test helpers, but there are things such as btrfs_fs_closing() and the read only helpers that also aren't directly related to the ctree code. Move these into a fs.h header, which will serve as the location for file system wide related helpers.
--- fs/btrfs/Makefile | 2 +- fs/btrfs/backref.c | 1 + fs/btrfs/block-group.c | 1 + fs/btrfs/ctree.h | 164 ------------------------------------- fs/btrfs/disk-io.c | 1 + fs/btrfs/extent-tree.c | 1 + fs/btrfs/file-item.c | 1 + fs/btrfs/file.c | 1 + fs/btrfs/free-space-tree.c | 1 + fs/btrfs/fs.c | 92 +++++++++++++++++++++ fs/btrfs/fs.h | 90 ++++++++++++++++++++ fs/btrfs/inode.c | 1 + fs/btrfs/ioctl.c | 1 + fs/btrfs/props.c | 1 + fs/btrfs/qgroup.c | 1 + fs/btrfs/relocation.c | 1 + fs/btrfs/scrub.c | 1 + fs/btrfs/space-info.c | 1 + fs/btrfs/super.c | 1 + fs/btrfs/transaction.c | 1 + fs/btrfs/tree-checker.c | 1 + fs/btrfs/tree-log.c | 1 + fs/btrfs/uuid-tree.c | 1 + fs/btrfs/verity.c | 1 + fs/btrfs/volumes.c | 1 + fs/btrfs/zoned.c | 1 + 26 files changed, 205 insertions(+), 165 deletions(-) create mode 100644 fs/btrfs/fs.c create mode 100644 fs/btrfs/fs.h
fs/btrfs/Makefile +1 -1
@@ -31,7 +31,7 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ backref.o ulist.o qgroup.o send.o dev-replace.o raid56.o \ uuid-tree.o props.o free-space-tree.o tree-checker.o space-info.o \ block-rsv.o delalloc-space.o block-group.o discard.o reflink.o \ - subpage.o tree-mod-log.o extent-io-tree.o + subpage.o tree-mod-log.o extent-io-tree.o fs.o btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o
fs/btrfs/backref.c +1 -0
@@ -15,6 +15,7 @@#include "locking.h" #include "misc.h" #include "tree-mod-log.h" +#include "fs.h" /* Just an arbitrary number so we can be sure this happened */ #define BACKREF_FOUND_SHARED 6
fs/btrfs/block-group.c +1 -0
@@ -17,6 +17,7 @@#include "discard.h" #include "raid56.h" #include "zoned.h" +#include "fs.h" #ifdef CONFIG_BTRFS_DEBUG int btrfs_should_fragment_free_space (struct btrfs_block_group *block_group)
fs/btrfs/ctree.h +0 -164
176 lines not on this page · raw message
fs/btrfs/disk-io.c +1 -0
@@ -43,6 +43,7 @@#include "space-info.h" #include "zoned.h" #include "subpage.h" +#include "fs.h" #define BTRFS_SUPER_FLAG_SUPP (BTRFS_HEADER_FLAG_WRITTEN |\ BTRFS_HEADER_FLAG_RELOC |\
fs/btrfs/extent-tree.c +1 -0
@@ -36,6 +36,7 @@#include "rcu-string.h" #include "zoned.h" #include "dev-replace.h" +#include "fs.h" #undef SCRAMBLE_DELAYED_REFS
fs/btrfs/file-item.c +1 -0
@@ -16,6 +16,7 @@#include "volumes.h" #include "print-tree.h" #include "compression.h" +#include "fs.h" #define __MAX_CSUM_ITEMS (r, size) ((unsigned long)(((BTRFS_LEAF_DATA_SIZE(r) - \ sizeof(struct btrfs_item) * 2) / \
fs/btrfs/file.c +1 -0
@@ -30,6 +30,7 @@#include "delalloc-space.h" #include "reflink.h" #include "subpage.h" +#include "fs.h" static struct kmem_cache *btrfs_inode_defrag_cachep;/*
fs/btrfs/free-space-tree.c +1 -0
@@ -11,6 +11,7 @@#include "free-space-tree.h" #include "transaction.h" #include "block-group.h" +#include "fs.h" static int __add_block_group_free_space(struct btrfs_trans_handle *trans, struct btrfs_block_group *block_group,
fs/btrfs/fs.c new file +92 -0
92 lines not on this page · raw message
fs/btrfs/fs.h new file +90 -0
90 lines not on this page · raw message
fs/btrfs/inode.c +1 -0
@@ -55,6 +55,7 @@#include "zoned.h" #include "subpage.h" #include "inode-item.h" +#include "fs.h" struct btrfs_iget_args {u64 ino;
fs/btrfs/ioctl.c +1 -0
@@ -50,6 +50,7 @@#include "delalloc-space.h" #include "block-group.h" #include "subpage.h" +#include "fs.h" #ifdef CONFIG_64BIT /* If we have a 32-bit userspace and 64-bit kernel, then the UAPI
fs/btrfs/props.c +1 -0
@@ -11,6 +11,7 @@#include "xattr.h" #include "compression.h" #include "space-info.h" +#include "fs.h" #define BTRFS_PROP_HANDLERS_HT_BITS 8 static DEFINE_HASHTABLE(prop_handlers_ht, BTRFS_PROP_HANDLERS_HT_BITS);
fs/btrfs/qgroup.c +1 -0
@@ -24,6 +24,7 @@#include "block-group.h" #include "sysfs.h" #include "tree-mod-log.h" +#include "fs.h" /* * Helpers to access qgroup reservation
fs/btrfs/relocation.c +1 -0
@@ -28,6 +28,7 @@#include "zoned.h" #include "inode-item.h" #include "space-info.h" +#include "fs.h" /* * Relocation overview
fs/btrfs/scrub.c +1 -0
@@ -21,6 +21,7 @@#include "raid56.h" #include "block-group.h" #include "zoned.h" +#include "fs.h" /* * This is only the first step towards a full-features scrub. It reads all
fs/btrfs/space-info.c +1 -0
@@ -10,6 +10,7 @@#include "transaction.h" #include "block-group.h" #include "zoned.h" +#include "fs.h" /* * HOW DOES SPACE RESERVATION WORK
fs/btrfs/super.c +1 -0
@@ -50,6 +50,7 @@#include "qgroup.h" #include "raid56.h" #include "space-info.h" +#include "fs.h" #define CREATE_TRACE_POINTS #include <trace/events/btrfs.h>
fs/btrfs/transaction.c +1 -0
@@ -23,6 +23,7 @@#include "block-group.h" #include "space-info.h" #include "zoned.h" +#include "fs.h" static struct kmem_cache *btrfs_trans_handle_cachep;
fs/btrfs/tree-checker.c +1 -0
@@ -25,6 +25,7 @@#include "volumes.h" #include "misc.h" #include "btrfs_inode.h" +#include "fs.h" /* * Error message should follow the following format:
fs/btrfs/tree-log.c +1 -0
@@ -21,6 +21,7 @@#include "space-info.h" #include "zoned.h" #include "inode-item.h" +#include "fs.h" #define MAX_CONFLICT_INODES 10
fs/btrfs/uuid-tree.c +1 -0
@@ -9,6 +9,7 @@#include "transaction.h" #include "disk-io.h" #include "print-tree.h" +#include "fs.h" static void btrfs_uuid_to_key (u8 *uuid,u8 type,struct btrfs_key *key)
fs/btrfs/verity.c +1 -0
@@ -15,6 +15,7 @@#include "transaction.h" #include "disk-io.h" #include "locking.h" +#include "fs.h" /* * Implementation of the interface defined in struct fsverity_operations.
fs/btrfs/volumes.c +1 -0
@@ -33,6 +33,7 @@#include "block-group.h" #include "discard.h" #include "zoned.h" +#include "fs.h" static struct bio_set btrfs_bioset;
fs/btrfs/zoned.c +1 -0
@@ -15,6 +15,7 @@#include "transaction.h" #include "dev-replace.h" #include "space-info.h" +#include "fs.h" /* Maximum number of zones to report per blkdev_report_zones() call */ #define BTRFS_REPORT_NR_ZONES 4096
Signature · 1 line
2.26.3
PATCH v3 2/15 btrfs: move assert helpers out of ctree.h
In reply to Josef BacikThese call functions that aren't defined in, or will be moved out of, ctree.h Move them to super.c where the other assert/error message code is defined.
--- fs/btrfs/ctree.h | 18 +++--------------- fs/btrfs/super.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 15 deletions(-)
fs/btrfs/ctree.h +3 -15
@@ -3320,18 +3320,11 @@ do { \ } while (0)#ifdef CONFIG_BTRFS_ASSERT -__cold __noreturn -static inline void assertfail (const char *expr,const char *file,int line) -{ -pr_err ("assertion failed: %s, in %s:%d\n" , expr, file, line); -BUG (); -} +void __cold btrfs_assertfail (const char *expr,const char *file,int line);#define ASSERT (expr) \ - (likely(expr) ? (void)0 : assertfail(#expr, __FILE__, __LINE__)) - + (likely(expr) ? (void)0 : btrfs_assertfail(#expr, __FILE__, __LINE__))#else -static inline void assertfail (const char *expr,const char * file,int line) { }#define ASSERT (expr) (void)(expr)#endif
@@ -3391,12 +3384,7 @@ static inline unsigned long get_eb_page_index(unsigned long offset)#define EXPORT_FOR_TESTS #endif -__cold -static inline void btrfs_print_v0_err (struct btrfs_fs_info *fs_info) -{ -btrfs_err (fs_info, -"Unsupported V0 extent filesystem detected. Aborting. Please re-create your filesystem with a newer kernel" ); -} +void __cold btrfs_print_v0_err (struct btrfs_fs_info *fs_info);__printf (5 ,6 )__cold
fs/btrfs/super.c +14 -0
@@ -306,6 +306,20 @@ void __cold _btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, }#endif +#ifdef CONFIG_BTRFS_ASSERT +void __cold btrfs_assertfail (const char *expr,const char *file,int line) +{ +pr_err ("assertion failed: %s, in %s:%d\n" , expr, file, line); +BUG (); +} +#endif + +void __cold btrfs_print_v0_err (struct btrfs_fs_info *fs_info) +{ +btrfs_err (fs_info, +"Unsupported V0 extent filesystem detected. Aborting. Please re-create your filesystem with a newer kernel" ); +} +#if BITS_PER_LONG ==32 void __cold btrfs_warn_32bit_limit (struct btrfs_fs_info *fs_info) {
Signature · 1 line
2.26.3
PATCH v3 3/15 btrfs: move the printk helpers out of ctree.h
In reply to Josef BacikWe have a bunch of printk helpers that are in ctree.h. These have nothing to do with ctree.c, so move them into their own header. Subsequent patches will cleanup the printk helpers.
--- fs/btrfs/backref.h | 1 + fs/btrfs/check-integrity.c | 1 + fs/btrfs/ctree.c | 1 + fs/btrfs/ctree.h | 246 ---------------------------------- fs/btrfs/delalloc-space.c | 1 + fs/btrfs/delayed-inode.c | 1 + fs/btrfs/delayed-ref.c | 1 + fs/btrfs/dir-item.c | 1 + fs/btrfs/extent-io-tree.c | 1 + fs/btrfs/extent_map.c | 1 + fs/btrfs/file-item.c | 1 + fs/btrfs/free-space-cache.c | 1 + fs/btrfs/free-space-tree.c | 1 + fs/btrfs/fs.c | 1 + fs/btrfs/inode-item.c | 1 + fs/btrfs/lzo.c | 1 + fs/btrfs/messages.h | 256 ++++++++++++++++++++++++++++++++++++ fs/btrfs/ordered-data.c | 1 + fs/btrfs/print-tree.c | 1 + fs/btrfs/props.c | 1 + fs/btrfs/raid56.c | 1 + fs/btrfs/ref-verify.c | 1 + fs/btrfs/reflink.c | 1 + fs/btrfs/root-tree.c | 1 + fs/btrfs/struct-funcs.c | 1 + fs/btrfs/subpage.c | 1 + fs/btrfs/super.c | 1 + fs/btrfs/sysfs.c | 1 + fs/btrfs/tree-checker.c | 1 + fs/btrfs/tree-log.h | 1 + fs/btrfs/tree-mod-log.c | 1 + fs/btrfs/ulist.c | 1 + fs/btrfs/uuid-tree.c | 1 + fs/btrfs/verity.c | 1 + fs/btrfs/xattr.c | 1 + fs/btrfs/zoned.h | 1 + 36 files changed, 290 insertions(+), 246 deletions(-) create mode 100644 fs/btrfs/messages.h
fs/btrfs/backref.h +1 -0
@@ -7,6 +7,7 @@#define BTRFS_BACKREF_H #include <linux/btrfs.h> +#include "messages.h" #include "ulist.h" #include "disk-io.h" #include "extent_io.h"
fs/btrfs/check-integrity.c +1 -0
@@ -82,6 +82,7 @@#include <linux/mm.h> #include <linux/string.h> #include <crypto/hash.h> +#include "messages.h" #include "ctree.h" #include "disk-io.h" #include "transaction.h"
fs/btrfs/ctree.c +1 -0
@@ -8,6 +8,7 @@#include <linux/rbtree.h> #include <linux/mm.h> #include <linux/error-injection.h> +#include "messages.h" #include "ctree.h" #include "disk-io.h" #include "transaction.h"
fs/btrfs/ctree.h +0 -246
264 lines not on this page · raw message
fs/btrfs/delalloc-space.c +1 -0
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 +#include "messages.h" #include "ctree.h" #include "delalloc-space.h" #include "block-rsv.h"
fs/btrfs/delayed-inode.c +1 -0
@@ -6,6 +6,7 @@#include <linux/slab.h> #include <linux/iversion.h> +#include "messages.h" #include "misc.h" #include "delayed-inode.h" #include "disk-io.h"
fs/btrfs/delayed-ref.c +1 -0
@@ -6,6 +6,7 @@#include <linux/sched.h> #include <linux/slab.h> #include <linux/sort.h> +#include "messages.h" #include "ctree.h" #include "delayed-ref.h" #include "transaction.h"
fs/btrfs/dir-item.c +1 -0
@@ -3,6 +3,7 @@* Copyright (C) 2007 Oracle. All rights reserved. */ +#include "messages.h" #include "ctree.h" #include "disk-io.h" #include "transaction.h"
fs/btrfs/extent-io-tree.c +1 -0
@@ -2,6 +2,7 @@#include <linux/slab.h> #include <trace/events/btrfs.h> +#include "messages.h" #include "ctree.h" #include "extent-io-tree.h" #include "btrfs_inode.h"
fs/btrfs/extent_map.c +1 -0
@@ -3,6 +3,7 @@#include <linux/err.h> #include <linux/slab.h> #include <linux/spinlock.h> +#include "messages.h" #include "ctree.h" #include "volumes.h" #include "extent_map.h"
fs/btrfs/file-item.c +1 -0
@@ -9,6 +9,7 @@#include <linux/highmem.h> #include <linux/sched/mm.h> #include <crypto/hash.h> +#include "messages.h" #include "misc.h" #include "ctree.h" #include "disk-io.h"
fs/btrfs/free-space-cache.c +1 -0
@@ -11,6 +11,7 @@#include <linux/ratelimit.h> #include <linux/error-injection.h> #include <linux/sched/mm.h> +#include "messages.h" #include "misc.h" #include "ctree.h" #include "free-space-cache.h"
fs/btrfs/free-space-tree.c +1 -0
@@ -5,6 +5,7 @@#include <linux/kernel.h> #include <linux/sched/mm.h> +#include "messages.h" #include "ctree.h" #include "disk-io.h" #include "locking.h"
fs/btrfs/fs.c +1 -0
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 +#include "messages.h" #include "ctree.h" #include "fs.h"
fs/btrfs/inode-item.c +1 -0
@@ -3,6 +3,7 @@* Copyright (C) 2007 Oracle. All rights reserved. */ +#include "messages.h" #include "ctree.h" #include "inode-item.h" #include "disk-io.h"
fs/btrfs/lzo.c +1 -0
@@ -13,6 +13,7 @@#include <linux/bio.h> #include <linux/lzo.h> #include <linux/refcount.h> +#include "messages.h" #include "compression.h" #include "ctree.h"
fs/btrfs/messages.h new file +256 -0
256 lines not on this page · raw message
fs/btrfs/ordered-data.c +1 -0
@@ -7,6 +7,7 @@#include <linux/blkdev.h> #include <linux/writeback.h> #include <linux/sched/mm.h> +#include "messages.h" #include "misc.h" #include "ctree.h" #include "transaction.h"
fs/btrfs/print-tree.c +1 -0
@@ -3,6 +3,7 @@* Copyright (C) 2007 Oracle. All rights reserved. */ +#include "messages.h" #include "ctree.h" #include "disk-io.h" #include "print-tree.h"
fs/btrfs/props.c +1 -0
@@ -4,6 +4,7 @@*/ #include <linux/hashtable.h> +#include "messages.h" #include "props.h" #include "btrfs_inode.h" #include "transaction.h"
fs/btrfs/raid56.c +1 -0
@@ -13,6 +13,7 @@#include <linux/list_sort.h> #include <linux/raid/xor.h> #include <linux/mm.h> +#include "messages.h" #include "misc.h" #include "ctree.h" #include "disk-io.h"
fs/btrfs/ref-verify.c +1 -0
@@ -5,6 +5,7 @@#include <linux/sched.h> #include <linux/stacktrace.h> +#include "messages.h" #include "ctree.h" #include "disk-io.h" #include "locking.h"
fs/btrfs/reflink.c +1 -0
@@ -2,6 +2,7 @@#include <linux/blkdev.h> #include <linux/iversion.h> +#include "messages.h" #include "compression.h" #include "ctree.h" #include "delalloc-space.h"
fs/btrfs/root-tree.c +1 -0
@@ -5,6 +5,7 @@#include <linux/err.h> #include <linux/uuid.h> +#include "messages.h" #include "ctree.h" #include "transaction.h" #include "disk-io.h"
fs/btrfs/struct-funcs.c +1 -0
@@ -5,6 +5,7 @@#include <asm/unaligned.h> +#include "messages.h" #include "ctree.h" static bool check_setget_bounds(const struct extent_buffer *eb,
fs/btrfs/subpage.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/slab.h> +#include "messages.h" #include "ctree.h" #include "subpage.h" #include "btrfs_inode.h"
fs/btrfs/super.c +1 -0
@@ -26,6 +26,7 @@#include <linux/ratelimit.h> #include <linux/crc32c.h> #include <linux/btrfs.h> +#include "messages.h" #include "delayed-inode.h" #include "ctree.h" #include "disk-io.h"
fs/btrfs/sysfs.c +1 -0
@@ -11,6 +11,7 @@#include <linux/bug.h> #include <crypto/hash.h> +#include "messages.h" #include "ctree.h" #include "discard.h" #include "disk-io.h"
fs/btrfs/tree-checker.c +1 -0
@@ -18,6 +18,7 @@#include <linux/types.h> #include <linux/stddef.h> #include <linux/error-injection.h> +#include "messages.h" #include "ctree.h" #include "tree-checker.h" #include "disk-io.h"
fs/btrfs/tree-log.h +1 -0
@@ -6,6 +6,7 @@#ifndef BTRFS_TREE_LOG_H #define BTRFS_TREE_LOG_H +#include "messages.h" #include "ctree.h" #include "transaction.h"
fs/btrfs/tree-mod-log.c +1 -0
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 +#include "messages.h" #include "tree-mod-log.h" #include "disk-io.h"
fs/btrfs/ulist.c +1 -0
@@ -5,6 +5,7 @@*/ #include <linux/slab.h> +#include "messages.h" #include "ulist.h" #include "ctree.h"
fs/btrfs/uuid-tree.c +1 -0
@@ -5,6 +5,7 @@#include <linux/uuid.h> #include <asm/unaligned.h> +#include "messages.h" #include "ctree.h" #include "transaction.h" #include "disk-io.h"
fs/btrfs/verity.c +1 -0
@@ -10,6 +10,7 @@#include <linux/iversion.h> #include <linux/fsverity.h> #include <linux/sched/mm.h> +#include "messages.h" #include "ctree.h" #include "btrfs_inode.h" #include "transaction.h"
fs/btrfs/xattr.c +1 -0
@@ -12,6 +12,7 @@#include <linux/posix_acl_xattr.h> #include <linux/iversion.h> #include <linux/sched/mm.h> +#include "messages.h" #include "ctree.h" #include "btrfs_inode.h" #include "transaction.h"
fs/btrfs/zoned.h +1 -0
@@ -5,6 +5,7 @@#include <linux/types.h> #include <linux/blkdev.h> +#include "messages.h" #include "volumes.h" #include "disk-io.h" #include "block-group.h"
Signature · 1 line
2.26.3
PATCH v3 4/15 btrfs: push printk index code into their respective helpers
In reply to Josef BacikThe printk index work can be pushed into the printk helpers themselves, this allows us to further sanitize btrfs-printk.h, removing the last include in the header itself.
--- fs/btrfs/messages.h | 29 +---------------------------- fs/btrfs/super.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 29 deletions(-)
fs/btrfs/messages.h +1 -28
@@ -13,19 +13,7 @@ void btrfs_no_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...) { } -#ifdef CONFIG_PRINTK_INDEX - -#define btrfs_printk(fs_info, fmt, args...) \ -do { \ - printk_index_subsys_emit("%sBTRFS %s (device %s): ", NULL, fmt); \ - _btrfs_printk(fs_info, fmt, ##args); \ -} while (0) - -__printf(2, 3) -__cold -void _btrfs_printk (const struct btrfs_fs_info *fs_info,const char *fmt, ...); - -#elif defined(CONFIG_PRINTK ) +#ifdef CONFIG_PRINTK #define btrfs_printk(fs_info, fmt, args...) \ _btrfs_printk(fs_info, fmt, ##args)
@@ -220,25 +208,10 @@ do { \ __LINE__, (errno), first); \ }while (0 ) -#ifdef CONFIG_PRINTK_INDEX - -#define btrfs_handle_fs_error(fs_info, errno, fmt, args...) \ -do { \ - printk_index_subsys_emit( \ - "BTRFS: error (device %s%s) in %s:%d: errno=%d %s", \ - KERN_CRIT, fmt); \ - __btrfs_handle_fs_error((fs_info), __func__, __LINE__, \ - (errno), fmt, ##args); \ -} while (0) - -#else - #define btrfs_handle_fs_error(fs_info, errno, fmt, args...) \ __btrfs_handle_fs_error((fs_info), __func__, __LINE__, \ (errno), fmt, ##args) -#endif - __printf(5, 6) __cold void __btrfs_panic(struct btrfs_fs_info *fs_info, const char *function,
fs/btrfs/super.c +11 -1
@@ -182,6 +182,12 @@ void __btrfs_handle_fs_error(struct btrfs_fs_info *fs_info, const char *functionconst char *errstr;#endif +#ifdef CONFIG_PRINTK_INDEX +printk_index_subsys_emit ( +"BTRFS: error (device %s%s) in %s:%d: errno=%d %s" , +KERN_CRIT , fmt); +#endif +/* * Special case: if the error is EROFS, and we're already * under SB_RDONLY, then it is safe here.
@@ -207,7 +213,7 @@ void __btrfs_handle_fs_error(struct btrfs_fs_info *fs_info, const char *functionpr_crit ("BTRFS: error (device %s%s) in %s:%d: errno=%d %s\n" , sb->s_id, statestr, function, line, errno, errstr); } -#endif +#endif /* CONFIG_PRINTK */ /* * Today we only save the error info to memory. Long term we'll
@@ -274,6 +280,10 @@ void __cold _btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt,const char *type = logtypes[4 ];struct ratelimit_state *ratelimit = &printk_limits[4 ]; +#ifdef CONFIG_PRINTK_INDEX +printk_index_subsys_emit ("%sBTRFS %s (device %s): " ,NULL , fmt); +#endif +va_start (args, fmt);while ((kern_level =printk_get_level (fmt)) !=0 ) {
Signature · 1 line
2.26.3
PATCH v3 6/15 btrfs: convert incompat and compat flag test helpers to defines
In reply to Josef BacikThese helpers use functions not defined in fs.h, they're simply accessors of the super block in fs_info, convert them to define's so that we don't have a weird dependency between fs.h and accessor.h.
--- fs/btrfs/fs.h | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)
fs/btrfs/fs.h +6 -14
@@ -44,6 +44,12 @@ void __btrfs_set_fs_compat_ro(struct btrfs_fs_info *fs_info, u64 flag,void __btrfs_clear_fs_compat_ro (struct btrfs_fs_info *fs_info,u64 flag,const char *name); +#define __btrfs_fs_incompat (__fs_info, flags) \ + (!!(btrfs_super_incompat_flags((__fs_info)->super_copy) & flags)) + +#define __btrfs_fs_compat_ro (__fs_info, flags) \ + (!!(btrfs_super_compat_ro_flags((__fs_info)->super_copy) & flags)) +#define btrfs_set_fs_incompat (__fs_info, opt) \ __btrfs_set_fs_incompat((__fs_info), BTRFS_FEATURE_INCOMPAT_##opt, \ #opt)
@@ -66,20 +72,6 @@ void __btrfs_clear_fs_compat_ro(struct btrfs_fs_info *fs_info, u64 flag,#define btrfs_fs_compat_ro (fs_info, opt) \ __btrfs_fs_compat_ro((fs_info), BTRFS_FEATURE_COMPAT_RO_##opt) -static inline bool __btrfs_fs_incompat (struct btrfs_fs_info *fs_info,u64 flag) -{ -struct btrfs_super_block *disk_super; - disk_super = fs_info->super_copy; -return !!(btrfs_super_incompat_flags (disk_super) & flag); -} - -static inline int __btrfs_fs_compat_ro (struct btrfs_fs_info *fs_info,u64 flag) -{ -struct btrfs_super_block *disk_super; - disk_super = fs_info->super_copy; -return !!(btrfs_super_compat_ro_flags (disk_super) & flag); -} -static inline int btrfs_fs_closing (struct btrfs_fs_info *fs_info) {/*
Signature · 1 line
2.26.3
PATCH v3 5/15 btrfs: move BTRFS_FS_STATE* defs and helpers to fs.h
In reply to Josef BacikWe're going to use fs.h to hold fs wide related helpers and definitions, move the FS_STATE enum and related helpers to fs.h, and then update all files that need these definitions to include fs.h.
--- fs/btrfs/compression.c | 1 + fs/btrfs/ctree.c | 1 + fs/btrfs/ctree.h | 46 --------------------------------- fs/btrfs/delalloc-space.c | 1 + fs/btrfs/delayed-inode.c | 3 ++- fs/btrfs/dev-replace.c | 1 + fs/btrfs/extent_io.c | 1 + fs/btrfs/free-space-cache.c | 3 ++- fs/btrfs/fs.h | 50 ++++++++++++++++++++++++++++++++++++ fs/btrfs/inode-item.c | 3 ++- fs/btrfs/reflink.c | 3 ++- fs/btrfs/root-tree.c | 3 ++- fs/btrfs/sysfs.c | 1 + fs/btrfs/tests/btrfs-tests.c | 1 + fs/btrfs/xattr.c | 3 ++- 15 files changed, 69 insertions(+), 52 deletions(-)
fs/btrfs/compression.c +1 -0
@@ -21,6 +21,7 @@#include <crypto/hash.h> #include "misc.h" #include "ctree.h" +#include "fs.h" #include "disk-io.h" #include "transaction.h" #include "btrfs_inode.h"
fs/btrfs/ctree.c +1 -0
@@ -18,6 +18,7 @@#include "qgroup.h" #include "tree-mod-log.h" #include "tree-checker.h" +#include "fs.h" static struct kmem_cache *btrfs_path_cachep;
fs/btrfs/ctree.h +0 -46
64 lines not on this page · raw message
fs/btrfs/delalloc-space.c +1 -0
@@ -9,6 +9,7 @@#include "transaction.h" #include "qgroup.h" #include "block-group.h" +#include "fs.h" /* * HOW DOES THIS WORK
fs/btrfs/delayed-inode.c +2 -1
@@ -6,12 +6,13 @@#include <linux/slab.h> #include <linux/iversion.h> +#include "ctree.h" +#include "fs.h" #include "messages.h" #include "misc.h" #include "delayed-inode.h" #include "disk-io.h" #include "transaction.h" -#include "ctree.h" #include "qgroup.h" #include "locking.h" #include "inode-item.h"
fs/btrfs/dev-replace.c +1 -0
@@ -23,6 +23,7 @@#include "sysfs.h" #include "zoned.h" #include "block-group.h" +#include "fs.h" /* * Device replace overview
fs/btrfs/extent_io.c +1 -0
@@ -30,6 +30,7 @@#include "zoned.h" #include "block-group.h" #include "compression.h" +#include "fs.h" static struct kmem_cache *extent_buffer_cache;
fs/btrfs/free-space-cache.c +2 -1
@@ -11,9 +11,10 @@#include <linux/ratelimit.h> #include <linux/error-injection.h> #include <linux/sched/mm.h> +#include "ctree.h" +#include "fs.h" #include "messages.h" #include "misc.h" -#include "ctree.h" #include "free-space-cache.h" #include "transaction.h" #include "disk-io.h"
fs/btrfs/fs.h +50 -0
60 lines not on this page · raw message
fs/btrfs/inode-item.c +2 -1
@@ -3,8 +3,9 @@* Copyright (C) 2007 Oracle. All rights reserved. */ -#include "messages.h" #include "ctree.h" +#include "fs.h" +#include "messages.h" #include "inode-item.h" #include "disk-io.h" #include "transaction.h"
fs/btrfs/reflink.c +2 -1
@@ -2,9 +2,10 @@#include <linux/blkdev.h> #include <linux/iversion.h> +#include "ctree.h" +#include "fs.h" #include "messages.h" #include "compression.h" -#include "ctree.h" #include "delalloc-space.h" #include "disk-io.h" #include "reflink.h"
fs/btrfs/root-tree.c +2 -1
@@ -5,8 +5,9 @@#include <linux/err.h> #include <linux/uuid.h> -#include "messages.h" #include "ctree.h" +#include "fs.h" +#include "messages.h" #include "transaction.h" #include "disk-io.h" #include "print-tree.h"
fs/btrfs/sysfs.c +1 -0
@@ -23,6 +23,7 @@#include "block-group.h" #include "qgroup.h" #include "misc.h" +#include "fs.h" /* * Structure name Path
fs/btrfs/tests/btrfs-tests.c +1 -0
@@ -16,6 +16,7 @@#include "../disk-io.h" #include "../qgroup.h" #include "../block-group.h" +#include "../fs.h" static struct vfsmount *test_mnt =NULL ;
fs/btrfs/xattr.c +2 -1
@@ -12,8 +12,9 @@#include <linux/posix_acl_xattr.h> #include <linux/iversion.h> #include <linux/sched/mm.h> -#include "messages.h" #include "ctree.h" +#include "fs.h" +#include "messages.h" #include "btrfs_inode.h" #include "transaction.h" #include "xattr.h"
Signature · 1 line
2.26.3
PATCH v3 7/15 btrfs: move mount option definitions to fs.h
In reply to Josef BacikThese are fs wide definitions and helpers, move them out of ctree.h and into fs.h.
--- fs/btrfs/block-rsv.c | 1 + fs/btrfs/ctree.h | 62 ------------------------------------- fs/btrfs/delayed-ref.c | 1 + fs/btrfs/discard.c | 1 + fs/btrfs/free-space-cache.c | 1 + fs/btrfs/fs.h | 62 +++++++++++++++++++++++++++++++++++++ fs/btrfs/ref-verify.c | 1 + 7 files changed, 67 insertions(+), 62 deletions(-)
fs/btrfs/block-rsv.c +1 -0
@@ -7,6 +7,7 @@#include "transaction.h" #include "block-group.h" #include "disk-io.h" +#include "fs.h" /* * HOW DO BLOCK RESERVES WORK
fs/btrfs/ctree.h +0 -62
68 lines not on this page · raw message
fs/btrfs/delayed-ref.c +1 -0
@@ -13,6 +13,7 @@#include "qgroup.h" #include "space-info.h" #include "tree-mod-log.h" +#include "fs.h" struct kmem_cache *btrfs_delayed_ref_head_cachep;struct kmem_cache *btrfs_delayed_tree_ref_cachep;
fs/btrfs/discard.c +1 -0
@@ -11,6 +11,7 @@#include "block-group.h" #include "discard.h" #include "free-space-cache.h" +#include "fs.h" /* * This contains the logic to handle async discard.
fs/btrfs/free-space-cache.c +1 -0
@@ -26,6 +26,7 @@#include "discard.h" #include "subpage.h" #include "inode-item.h" +#include "fs.h" #define BITS_PER_BITMAP (PAGE_SIZE * 8UL)#define MAX_CACHE_BYTES_PER_GIG SZ_64K
fs/btrfs/fs.h +62 -0
74 lines not on this page · raw message
fs/btrfs/ref-verify.c +1 -0
@@ -11,6 +11,7 @@#include "locking.h" #include "delayed-ref.h" #include "ref-verify.h" +#include "fs.h" /* * Used to keep track the roots and number of refs each root has for a given
Signature · 1 line
2.26.3
PATCH v3 8/15 btrfs: move fs_info->flags enum to fs.h
In reply to Josef BacikThese definitions are fs wide, take them out of ctree.h and put them in fs.h.
--- fs/btrfs/ctree.h | 68 ----------------------------------- fs/btrfs/delayed-inode.c | 1 + fs/btrfs/fs.h | 68 +++++++++++++++++++++++++++++++++++ fs/btrfs/root-tree.c | 1 + fs/btrfs/tests/qgroup-tests.c | 1 + fs/btrfs/tree-mod-log.c | 1 + 6 files changed, 72 insertions(+), 68 deletions(-)
fs/btrfs/ctree.h +0 -68
@@ -272,69 +272,6 @@ struct btrfs_discard_ctl {atomic64_t discard_bytes_saved; }; -enum { -BTRFS_FS_CLOSING_START , -BTRFS_FS_CLOSING_DONE , -BTRFS_FS_LOG_RECOVERING , -BTRFS_FS_OPEN , -BTRFS_FS_QUOTA_ENABLED , -BTRFS_FS_UPDATE_UUID_TREE_GEN , -BTRFS_FS_CREATING_FREE_SPACE_TREE , -BTRFS_FS_BTREE_ERR , -BTRFS_FS_LOG1_ERR , -BTRFS_FS_LOG2_ERR , -BTRFS_FS_QUOTA_OVERRIDE , -/* Used to record internally whether fs has been frozen */ -BTRFS_FS_FROZEN , -/* -* Indicate that balance has been set up from the ioctl and is in the -* main phase. The fs_info::balance_ctl is initialized. -*/ -BTRFS_FS_BALANCE_RUNNING , - -/* -* Indicate that relocation of a chunk has started, it's set per chunk -* and is toggled between chunks. -*/ -BTRFS_FS_RELOC_RUNNING , - -/* Indicate that the cleaner thread is awake and doing something. */ -BTRFS_FS_CLEANER_RUNNING , - -/* -* The checksumming has an optimized version and is considered fast, -* so we don't need to offload checksums to workqueues. -*/ -BTRFS_FS_CSUM_IMPL_FAST , - -/* Indicate that the discard workqueue can service discards. */ -BTRFS_FS_DISCARD_RUNNING , - -/* Indicate that we need to cleanup space cache v1 */ -BTRFS_FS_CLEANUP_SPACE_CACHE_V1 , - -/* Indicate that we can't trust the free space tree for caching yet */ -BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED , - -/* Indicate whether there are any tree modification log users */ -BTRFS_FS_TREE_MOD_LOG_USERS , - -/* Indicate that we want the transaction kthread to commit right now. */ -BTRFS_FS_COMMIT_TRANS , - -/* Indicate we have half completed snapshot deletions pending. */ -BTRFS_FS_UNFINISHED_DROPS , - -/* Indicate we have to finish a zone to do next allocation. */ -BTRFS_FS_NEED_ZONE_FINISH , - -#if BITS_PER_LONG ==32 -/* Indicate if we have error/warn message printed on 32bit systems */ -BTRFS_FS_32BIT_ERROR , -BTRFS_FS_32BIT_WARN , -#endif -}; -/* * Exclusive operations (device replace, resize, device add/remove, balance) */
@@ -1029,11 +966,6 @@ enum btrfs_lockdep_trans_states { &lock##_key, 0); \ }while (0 ) -static inline void btrfs_wake_unfinished_drop(struct btrfs_fs_info *fs_info) -{ -clear_and_wake_up_bit (BTRFS_FS_UNFINISHED_DROPS , &fs_info->flags); -} -/* * Record swapped tree blocks of a subvolume tree for delayed subtree trace * code. For detail check comment in fs/btrfs/qgroup.c.
fs/btrfs/delayed-inode.c +1 -0
@@ -17,6 +17,7 @@#include "locking.h" #include "inode-item.h" #include "space-info.h" +#include "fs.h" #define BTRFS_DELAYED_WRITEBACK 512#define BTRFS_DELAYED_BACKGROUND 128
fs/btrfs/fs.h +68 -0
80 lines not on this page · raw message
fs/btrfs/root-tree.c +1 -0
@@ -13,6 +13,7 @@#include "print-tree.h" #include "qgroup.h" #include "space-info.h" +#include "fs.h" /* * Read a root item from the tree. In case we detect a root item smaller then
fs/btrfs/tests/qgroup-tests.c +1 -0
@@ -10,6 +10,7 @@#include "../disk-io.h" #include "../qgroup.h" #include "../backref.h" +#include "../fs.h" static int insert_normal_tree_ref (struct btrfs_root *root,u64 bytenr,u64 num_bytes,u64 parent,u64 root_objectid)
fs/btrfs/tree-mod-log.c +1 -0
@@ -3,6 +3,7 @@#include "messages.h" #include "tree-mod-log.h" #include "disk-io.h" +#include "fs.h" struct tree_mod_root {u64 logical;
Signature · 1 line
2.26.3
PATCH v3 9/15 btrfs: add a BTRFS_FS_NEED_TRANS_COMMIT flag
In reply to Josef BacikCurrently we are only using fs_info->pending_changes to indicate that we need a transaction commit. The original users for this were removed years ago, so this is the only remaining reason to have this field. Add a flag so we can remove this code.
--- fs/btrfs/fs.h | 3 +++ fs/btrfs/super.c | 3 ++- fs/btrfs/sysfs.c | 4 ++-- fs/btrfs/transaction.c | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-)
fs/btrfs/fs.h +3 -0
@@ -90,6 +90,9 @@ enum {/* Indicate we have to finish a zone to do next allocation. */ BTRFS_FS_NEED_ZONE_FINISH , +/* Indicate that we want to commit the transaction. */ +BTRFS_FS_NEED_TRANS_COMMIT , + #if BITS_PER_LONG == 32/* Indicate if we have error/warn message printed on 32bit systems */ BTRFS_FS_32BIT_ERROR,
fs/btrfs/super.c +2 -1
@@ -1534,7 +1534,8 @@ int btrfs_sync_fs(struct super_block *sb, int wait)* Exit unless we have some pending changes * that need to go through commit */ -if (fs_info->pending_changes ==0 ) +if (!test_bit (BTRFS_FS_NEED_TRANS_COMMIT , + &fs_info->flags))return 0 ;/* * A non-blocking test if the fs is frozen. We must not
fs/btrfs/sysfs.c +2 -2
@@ -250,7 +250,7 @@ static ssize_t btrfs_feature_attr_store(struct kobject *kobj,/* * We don't want to do full transaction commit from inside sysfs */ -btrfs_set_pending (fs_info,COMMIT ); +set_bit (BTRFS_FS_NEED_TRANS_COMMIT , &fs_info->flags);wake_up_process (fs_info->transaction_kthread);return count;
@@ -961,7 +961,7 @@ static ssize_t btrfs_label_store(struct kobject *kobj,/* * We don't want to do full transaction commit from inside sysfs */ -btrfs_set_pending (fs_info,COMMIT ); +set_bit (BTRFS_FS_NEED_TRANS_COMMIT , &fs_info->flags);wake_up_process (fs_info->transaction_kthread);return len;
fs/btrfs/transaction.c +2 -0
@@ -2104,6 +2104,8 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)ASSERT (refcount_read (&trans->use_count) ==1 );btrfs_trans_state_lockdep_acquire (fs_info,BTRFS_LOCKDEP_TRANS_COMMIT_START ); +clear_bit (BTRFS_FS_NEED_TRANS_COMMIT , &fs_info->flags); +/* Stop the commit early if ->aborted is set */ if (TRANS_ABORTED (cur_trans)) { ret = cur_trans->aborted;
Signature · 1 line
2.26.3
PATCH v3 10/15 btrfs: remove fs_info::pending_changes and related code
In reply to Josef BacikNow that we're not using this code anywhere we can remove it as well as the member from fs_info.
--- fs/btrfs/ctree.h | 23 +---------------------- fs/btrfs/disk-io.c | 6 ------ fs/btrfs/transaction.c | 25 ------------------------- fs/btrfs/transaction.h | 1 - 4 files changed, 1 insertion(+), 54 deletions(-)
fs/btrfs/ctree.h +1 -22
@@ -365,11 +365,7 @@ struct btrfs_fs_info {*/ u64 last_trans_log_full_commit;unsigned long mount_opt; -/* -* Track requests for actions that need to be done during transaction -* commit (like for some mount options). -*/ -unsigned long pending_changes; + unsigned long compress_type:4;unsigned int compress_level;u32 commit_interval;
@@ -1252,23 +1248,6 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(const struct btrfs_fs_info *info)return BTRFS_MAX_ITEM_SIZE (info) -sizeof (struct btrfs_dir_item ); } -/* -* Requests for changes that need to be done during transaction commit. -* -* Internal mount options that are used for special handling of the real -* mount options (eg. cannot be set during remount and have to be set during -* transaction commit) -*/ - -#define BTRFS_PENDING_COMMIT (0) - -#define btrfs_test_pending (info, opt) \ - test_bit(BTRFS_PENDING_##opt, &(info)->pending_changes) -#define btrfs_set_pending (info, opt) \ - set_bit(BTRFS_PENDING_##opt, &(info)->pending_changes) -#define btrfs_clear_pending (info, opt) \ - clear_bit(BTRFS_PENDING_##opt, &(info)->pending_changes) -struct btrfs_map_token {struct extent_buffer *eb;char *kaddr;
fs/btrfs/disk-io.c +0 -6
@@ -3750,12 +3750,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_devicebtrfs_set_and_info (fs_info,SSD ,"enabling ssd optimizations" ); } -/* -* Mount does not set all options immediately, we can do it now and do -* not have to wait for transaction commit -*/ -btrfs_apply_pending_changes (fs_info); -#ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY if (btrfs_test_opt (fs_info,CHECK_INTEGRITY )) { ret = btrfsic_mount(fs_info, fs_devices,
fs/btrfs/transaction.c +0 -25
@@ -2359,12 +2359,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)if (ret) goto unlock_reloc; -/* -* Since the transaction is done, we can apply the pending changes -* before the next transaction. -*/ -btrfs_apply_pending_changes (fs_info); -/* commit_fs_roots gets rid of all the tree log roots, it is now * safe to free the root of tree log roots */
@@ -2587,25 +2581,6 @@ int btrfs_clean_one_deleted_snapshot(struct btrfs_fs_info *fs_info)return (ret <0 ) ?0 :1 ; } -void btrfs_apply_pending_changes (struct btrfs_fs_info *fs_info) -{ -unsigned long prev; -unsigned long bit; - - prev =xchg (&fs_info->pending_changes,0 ); -if (!prev) -return ; - - bit =1 <<BTRFS_PENDING_COMMIT ; -if (prev & bit) -btrfs_debug (fs_info,"pending commit done" ); - prev &= ~bit; - -if (prev) -btrfs_warn (fs_info, -"unknown pending changes left 0x%lx, ignoring" , prev); -} -int __init btrfs_transaction_init (void ) { btrfs_trans_handle_cachep = kmem_cache_create("btrfs_trans_handle",
fs/btrfs/transaction.h +0 -1
@@ -231,7 +231,6 @@ int btrfs_wait_tree_log_extents(struct btrfs_root *root, int mark);int btrfs_transaction_blocked (struct btrfs_fs_info *info);int btrfs_transaction_in_commit (struct btrfs_fs_info *info);void btrfs_put_transaction (struct btrfs_transaction *transaction); -void btrfs_apply_pending_changes (struct btrfs_fs_info *fs_info);void btrfs_add_dropped_root (struct btrfs_trans_handle *trans,struct btrfs_root *root);void btrfs_trans_release_chunk_metadata (struct btrfs_trans_handle *trans);
Signature · 1 line
2.26.3
PATCH v3 13/15 btrfs: move btrfs_map_token to accessors
In reply to Josef BacikThis is specific to the item-accessor code, move it out of ctree.h into accessor.h/.c and then update the users to include the new header file. This un-inline's btrfs_init_map_token, however this is only called once per function.
--- fs/btrfs/accessors.c | 9 +++++++++ fs/btrfs/accessors.h | 15 +++++++++++++++ fs/btrfs/ctree.c | 1 + fs/btrfs/ctree.h | 16 ++-------------- fs/btrfs/inode.c | 1 + fs/btrfs/tree-log.c | 1 + 6 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 fs/btrfs/accessors.h
fs/btrfs/accessors.c +9 -0
@@ -7,6 +7,7 @@#include "messages.h" #include "ctree.h" +#include "accessors.h" static bool check_setget_bounds (const struct extent_buffer *eb,const void *ptr,unsigned off,int size)
@@ -24,6 +25,14 @@ static bool check_setget_bounds(const struct extent_buffer *eb,return true; } +void btrfs_init_map_token (struct btrfs_map_token *token, +struct extent_buffer *eb) +{ + token->eb = eb; + token->kaddr =page_address (eb->pages[0 ]); + token->offset =0 ; +} +/* * Macro templates that define helpers to read/write extent buffer data of a * given size, that are also used via ctree.h for access to item members by
fs/btrfs/accessors.h new file +15 -0
@@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0 + +#ifndef BTRFS_ITEM_ACCESSORS_H +#define BTRFS_ITEM_ACCESSORS_H + +struct btrfs_map_token { +struct extent_buffer *eb; +char *kaddr; +unsigned long offset; +}; + +void btrfs_init_map_token (struct btrfs_map_token *token, +struct extent_buffer *eb); + +#endif /* BTRFS_ITEM_ACCESSORS_H */
fs/btrfs/ctree.c +1 -0
@@ -19,6 +19,7 @@#include "tree-mod-log.h" #include "tree-checker.h" #include "fs.h" +#include "accessors.h" static struct kmem_cache *btrfs_path_cachep;
fs/btrfs/ctree.h +2 -14
@@ -51,6 +51,8 @@ struct btrfs_balance_control;struct btrfs_delayed_root ;struct reloc_control ; +struct btrfs_map_token ; +#define BTRFS_OLDEST_GENERATION 0ULL#define BTRFS_EMPTY_DIR_SIZE 0
@@ -1191,23 +1193,9 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(const struct btrfs_fs_info *info)return BTRFS_MAX_ITEM_SIZE (info) -sizeof (struct btrfs_dir_item ); } -struct btrfs_map_token { -struct extent_buffer *eb; -char *kaddr; -unsigned long offset; -}; -#define BTRFS_BYTES_TO_BLKS (fs_info, bytes) \ ((bytes) >> (fs_info)->sectorsize_bits) -static inline void btrfs_init_map_token (struct btrfs_map_token *token, -struct extent_buffer *eb) -{ - token->eb = eb; - token->kaddr =page_address (eb->pages[0 ]); - token->offset =0 ; -} -/* some macros to generate set/get functions for the struct fields. This * assumes there is a lefoo_to_cpu for every type, so lets make a simple * one for u8:
fs/btrfs/inode.c +1 -0
@@ -56,6 +56,7 @@#include "subpage.h" #include "inode-item.h" #include "fs.h" +#include "accessors.h" struct btrfs_iget_args {u64 ino;
fs/btrfs/tree-log.c +1 -0
@@ -22,6 +22,7 @@#include "zoned.h" #include "inode-item.h" #include "fs.h" +#include "accessors.h" #define MAX_CONFLICT_INODES 10
Signature · 1 line
2.26.3
PATCH v3 14/15 btrfs: move accessor helpers into accessors.h
In reply to Josef BacikThis is a large patch, but because they're all macros it's impossible to split up. Simply copy all of the item accessors in ctree.h and paste them in accessors.h, and then update any files to include the header so everything compiles.
--- fs/btrfs/accessors.h | 1090 ++++++++++++++++++++++++ fs/btrfs/backref.c | 1 + fs/btrfs/block-group.c | 1 + fs/btrfs/block-rsv.c | 1 + fs/btrfs/check-integrity.c | 1 + fs/btrfs/ctree.h | 1090 ------------------------ fs/btrfs/delayed-inode.c | 1 + fs/btrfs/dev-replace.c | 1 + fs/btrfs/dir-item.c | 1 + fs/btrfs/disk-io.c | 1 + fs/btrfs/export.c | 1 + fs/btrfs/extent-tree.c | 1 + fs/btrfs/extent_io.c | 1 + fs/btrfs/file-item.c | 1 + fs/btrfs/file.c | 1 + fs/btrfs/free-space-cache.c | 1 + fs/btrfs/free-space-tree.c | 1 + fs/btrfs/fs.c | 1 + fs/btrfs/inode-item.c | 1 + fs/btrfs/ioctl.c | 1 + fs/btrfs/locking.c | 1 + fs/btrfs/print-tree.c | 1 + fs/btrfs/props.c | 1 + fs/btrfs/qgroup.c | 1 + fs/btrfs/ref-verify.c | 1 + fs/btrfs/reflink.c | 1 + fs/btrfs/relocation.c | 1 + fs/btrfs/root-tree.c | 1 + fs/btrfs/scrub.c | 1 + fs/btrfs/send.c | 1 + fs/btrfs/space-info.c | 1 + fs/btrfs/super.c | 1 + fs/btrfs/sysfs.c | 1 + fs/btrfs/tests/extent-buffer-tests.c | 1 + fs/btrfs/tests/free-space-tree-tests.c | 1 + fs/btrfs/tests/inode-tests.c | 1 + fs/btrfs/tests/qgroup-tests.c | 1 + fs/btrfs/transaction.c | 1 + fs/btrfs/tree-checker.c | 1 + fs/btrfs/tree-defrag.c | 1 + fs/btrfs/tree-mod-log.c | 1 + fs/btrfs/uuid-tree.c | 2 +- fs/btrfs/verity.c | 1 + fs/btrfs/volumes.c | 1 + fs/btrfs/xattr.c | 1 + fs/btrfs/zoned.c | 1 + 46 files changed, 1134 insertions(+), 1091 deletions(-)
fs/btrfs/accessors.h +1090 -0
@@ -9,7 +9,1097 @@ struct btrfs_map_token {unsigned long offset; }; +#define BTRFS_LEAF_DATA_OFFSET offsetof(struct btrfs_leaf, items) +void btrfs_init_map_token (struct btrfs_map_token *token,struct extent_buffer *eb); +/* some macros to generate set/get functions for the struct fields. This +* assumes there is a lefoo_to_cpu for every type, so lets make a simple +* one for u8: +*/ +#define le8_to_cpu (v) (v) +#define cpu_to_le8 (v) (v) +#define __le8 u8 + +static inline u8 get_unaligned_le8 (const void *p) +{ +return *(u8 *)p; +} + +static inline void put_unaligned_le8 (u8 val,void *p) +{ + *(u8 *)p = val; +} + +#define read_eb_member (eb, ptr, type, member, result) (\ + read_extent_buffer(eb, (char *)(result), \ + ((unsigned long)(ptr)) + \ + offsetof(type, member), \ + sizeof(((type *)0)->member))) + +#define write_eb_member (eb, ptr, type, member, result) (\ + write_extent_buffer(eb, (char *)(result), \ + ((unsigned long)(ptr)) + \ + offsetof(type, member), \ + sizeof(((type *)0)->member))) + +#define DECLARE_BTRFS_SETGET_BITS (bits) \ +u##bits btrfs_get_token_##bits(struct btrfs_map_token *token, \ + const void *ptr, unsigned long off); \ +void btrfs_set_token_##bits(struct btrfs_map_token *token, \ + const void *ptr, unsigned long off, \ + u##bits val); \ +u##bits btrfs_get_##bits(const struct extent_buffer *eb, \ + const void *ptr, unsigned long off); \ +void btrfs_set_##bits(const struct extent_buffer *eb, void *ptr, \ + unsigned long off, u##bits val); + +DECLARE_BTRFS_SETGET_BITS(8) +DECLARE_BTRFS_SETGET_BITS(16) +DECLARE_BTRFS_SETGET_BITS(32) +DECLARE_BTRFS_SETGET_BITS(64) + +#define BTRFS_SETGET_FUNCS (name, type, member, bits) \ +static inline u##bits btrfs_##name(const struct extent_buffer *eb, \ + const type *s) \ +{ \ + static_assert(sizeof(u##bits) == sizeof(((type *)0))->member); \ + return btrfs_get_##bits(eb, s, offsetof(type, member)); \ +} \ +static inline void btrfs_set_##name(const struct extent_buffer *eb, type *s, \ + u##bits val) \ +{ \ + static_assert(sizeof(u##bits) == sizeof(((type *)0))->member); \ + btrfs_set_##bits(eb, s, offsetof(type, member), val); \ +} \ +static inline u##bits btrfs_token_##name(struct btrfs_map_token *token, \ + const type *s) \ +{ \ + static_assert(sizeof(u##bits) == sizeof(((type *)0))->member); \ + return btrfs_get_token_##bits(token, s, offsetof(type, member));\ +} \ +static inline void btrfs_set_token_##name(struct btrfs_map_token *token,\ + type *s, u##bits val) \ +{ \ + static_assert(sizeof(u##bits) == sizeof(((type *)0))->member); \ + btrfs_set_token_##bits(token, s, offsetof(type, member), val); \ +} + +#define BTRFS_SETGET_HEADER_FUNCS (name, type, member, bits) \ +static inline u##bits btrfs_##name(const struct extent_buffer *eb) \ +{ \ + const type *p = page_address(eb->pages[0]) + \ + offset_in_page(eb->start); \ + return get_unaligned_le##bits(&p->member); \ +} \ +static inline void btrfs_set_##name(const struct extent_buffer *eb, \ + u##bits val) \ +{ \ + type *p = page_address(eb->pages[0]) + offset_in_page(eb->start); \ + put_unaligned_le##bits(val, &p->member); \ +} + +#define BTRFS_SETGET_STACK_FUNCS (name, type, member, bits) \ +static inline u##bits btrfs_##name(const type *s) \ +{ \ + return get_unaligned_le##bits(&s->member); \ +} \ +static inline void btrfs_set_##name(type *s, u##bits val) \ +{ \ + put_unaligned_le##bits(val, &s->member); \ +} + +static inline u64 btrfs_device_total_bytes (const struct extent_buffer *eb, +struct btrfs_dev_item *s) +{ +static_assert (sizeof (u64) == +sizeof (((struct btrfs_dev_item *)0 ))->total_bytes); +return btrfs_get_64 (eb, s, offsetof(struct btrfs_dev_item , + total_bytes)); +} +static inline void btrfs_set_device_total_bytes (const struct extent_buffer *eb, +struct btrfs_dev_item *s, +u64 val) +{ +static_assert (sizeof (u64) == +sizeof (((struct btrfs_dev_item *)0 ))->total_bytes); +WARN_ON (!IS_ALIGNED (val, eb->fs_info->sectorsize)); +btrfs_set_64 (eb, s, offsetof(struct btrfs_dev_item , total_bytes), val); +} + + +BTRFS_SETGET_FUNCS(device_type, struct btrfs_dev_item, type, 64); +BTRFS_SETGET_FUNCS(device_bytes_used, struct btrfs_dev_item, bytes_used, 64); +BTRFS_SETGET_FUNCS(device_io_align, struct btrfs_dev_item, io_align, 32); +BTRFS_SETGET_FUNCS(device_io_width, struct btrfs_dev_item, io_width, 32); +BTRFS_SETGET_FUNCS(device_start_offset, struct btrfs_dev_item, + start_offset,64 ); +BTRFS_SETGET_FUNCS(device_sector_size, struct btrfs_dev_item, sector_size, 32); +BTRFS_SETGET_FUNCS(device_id, struct btrfs_dev_item, devid, 64); +BTRFS_SETGET_FUNCS(device_group, struct btrfs_dev_item, dev_group, 32); +BTRFS_SETGET_FUNCS(device_seek_speed, struct btrfs_dev_item, seek_speed, 8); +BTRFS_SETGET_FUNCS(device_bandwidth, struct btrfs_dev_item, bandwidth, 8); +BTRFS_SETGET_FUNCS(device_generation, struct btrfs_dev_item, generation, 64); + +BTRFS_SETGET_STACK_FUNCS(stack_device_type, struct btrfs_dev_item, type, 64); +BTRFS_SETGET_STACK_FUNCS(stack_device_total_bytes, struct btrfs_dev_item, + total_bytes,64 ); +BTRFS_SETGET_STACK_FUNCS(stack_device_bytes_used, struct btrfs_dev_item, + bytes_used,64 ); +BTRFS_SETGET_STACK_FUNCS(stack_device_io_align, struct btrfs_dev_item, + io_align,32 ); +BTRFS_SETGET_STACK_FUNCS(stack_device_io_width, struct btrfs_dev_item, + io_width,32 ); +BTRFS_SETGET_STACK_FUNCS(stack_device_sector_size, struct btrfs_dev_item, + sector_size,32 ); +BTRFS_SETGET_STACK_FUNCS(stack_device_id, struct btrfs_dev_item, devid, 64); +BTRFS_SETGET_STACK_FUNCS(stack_device_group, struct btrfs_dev_item, + dev_group,32 ); +BTRFS_SETGET_STACK_FUNCS(stack_device_seek_speed, struct btrfs_dev_item, + seek_speed,8 ); +BTRFS_SETGET_STACK_FUNCS(stack_device_bandwidth, struct btrfs_dev_item, + bandwidth,8 ); +BTRFS_SETGET_STACK_FUNCS(stack_device_generation, struct btrfs_dev_item, + generation,64 ); + +static inline unsigned long btrfs_device_uuid (struct btrfs_dev_item *d) +{ +return (unsigned long )d + offsetof(struct btrfs_dev_item , uuid); +} + +static inline unsigned long btrfs_device_fsid (struct btrfs_dev_item *d) +{ +return (unsigned long )d + offsetof(struct btrfs_dev_item , fsid); +} + +BTRFS_SETGET_FUNCS(chunk_length, struct btrfs_chunk, length, 64); +BTRFS_SETGET_FUNCS(chunk_owner, struct btrfs_chunk, owner, 64); +BTRFS_SETGET_FUNCS(chunk_stripe_len, struct btrfs_chunk, stripe_len, 64); +BTRFS_SETGET_FUNCS(chunk_io_align, struct btrfs_chunk, io_align, 32); +BTRFS_SETGET_FUNCS(chunk_io_width, struct btrfs_chunk, io_width, 32); +BTRFS_SETGET_FUNCS(chunk_sector_size, struct btrfs_chunk, sector_size, 32); +BTRFS_SETGET_FUNCS(chunk_type, struct btrfs_chunk, type, 64); +BTRFS_SETGET_FUNCS(chunk_num_stripes, struct btrfs_chunk, num_stripes, 16); +BTRFS_SETGET_FUNCS(chunk_sub_stripes, struct btrfs_chunk, sub_stripes, 16); +BTRFS_SETGET_FUNCS(stripe_devid, struct btrfs_stripe, devid, 64); +BTRFS_SETGET_FUNCS(stripe_offset, struct btrfs_stripe, offset, 64); + +static inline char *btrfs_stripe_dev_uuid (struct btrfs_stripe *s) +{ +return (char *)s + offsetof(struct btrfs_stripe , dev_uuid); +} + +BTRFS_SETGET_STACK_FUNCS(stack_chunk_length, struct btrfs_chunk, length, 64); +BTRFS_SETGET_STACK_FUNCS(stack_chunk_owner, struct btrfs_chunk, owner, 64); +BTRFS_SETGET_STACK_FUNCS(stack_chunk_stripe_len, struct btrfs_chunk, + stripe_len,64 ); +BTRFS_SETGET_STACK_FUNCS(stack_chunk_io_align, struct btrfs_chunk, + io_align,32 ); +BTRFS_SETGET_STACK_FUNCS(stack_chunk_io_width, struct btrfs_chunk, + io_width,32 ); +BTRFS_SETGET_STACK_FUNCS(stack_chunk_sector_size, struct btrfs_chunk, + sector_size,32 ); +BTRFS_SETGET_STACK_FUNCS(stack_chunk_type, struct btrfs_chunk, type, 64); +BTRFS_SETGET_STACK_FUNCS(stack_chunk_num_stripes, struct btrfs_chunk, + num_stripes,16 ); +BTRFS_SETGET_STACK_FUNCS(stack_chunk_sub_stripes, struct btrfs_chunk, + sub_stripes,16 ); +BTRFS_SETGET_STACK_FUNCS(stack_stripe_devid, struct btrfs_stripe, devid, 64); +BTRFS_SETGET_STACK_FUNCS(stack_stripe_offset, struct btrfs_stripe, offset, 64); + +static inline struct btrfs_stripe *btrfs_stripe_nr (struct btrfs_chunk *c, +int nr) +{ +unsigned long offset = (unsigned long )c; + offset += offsetof(struct btrfs_chunk , stripe); + offset += nr *sizeof (struct btrfs_stripe ); +return (struct btrfs_stripe *)offset; +} + +static inline char *btrfs_stripe_dev_uuid_nr (struct btrfs_chunk *c,int nr) +{ +return btrfs_stripe_dev_uuid (btrfs_stripe_nr (c, nr)); +} + +static inline u64 btrfs_stripe_offset_nr (const struct extent_buffer *eb, +struct btrfs_chunk *c,int nr) +{ +return btrfs_stripe_offset (eb,btrfs_stripe_nr (c, nr)); +} + +static inline u64 btrfs_stripe_devid_nr (const struct extent_buffer *eb, +struct btrfs_chunk *c,int nr) +{ +return btrfs_stripe_devid (eb,btrfs_stripe_nr (c, nr)); +} + +/* struct btrfs_block_group_item */ +BTRFS_SETGET_STACK_FUNCS(stack_block_group_used, struct btrfs_block_group_item, + used,64 ); +BTRFS_SETGET_FUNCS(block_group_used, struct btrfs_block_group_item, + used,64 ); +BTRFS_SETGET_STACK_FUNCS (stack_block_group_chunk_objectid, + struct btrfs_block_group_item, chunk_objectid, 64); + +BTRFS_SETGET_FUNCS (block_group_chunk_objectid, + struct btrfs_block_group_item, chunk_objectid, 64); +BTRFS_SETGET_FUNCS (block_group_flags, + struct btrfs_block_group_item, flags, 64); +BTRFS_SETGET_STACK_FUNCS (stack_block_group_flags, + struct btrfs_block_group_item, flags, 64); + +/* struct btrfs_free_space_info */ +BTRFS_SETGET_FUNCS(free_space_extent_count, struct btrfs_free_space_info, + extent_count,32 ); +BTRFS_SETGET_FUNCS(free_space_flags, struct btrfs_free_space_info, flags, 32); + +/* struct btrfs_inode_ref */ +BTRFS_SETGET_FUNCS(inode_ref_name_len, struct btrfs_inode_ref, name_len, 16); +BTRFS_SETGET_FUNCS(inode_ref_index, struct btrfs_inode_ref, index, 64); + +/* struct btrfs_inode_extref */ +BTRFS_SETGET_FUNCS(inode_extref_parent, struct btrfs_inode_extref, + parent_objectid,64 ); +BTRFS_SETGET_FUNCS(inode_extref_name_len, struct btrfs_inode_extref, + name_len,16 ); +BTRFS_SETGET_FUNCS(inode_extref_index, struct btrfs_inode_extref, index, 64); + +/* struct btrfs_inode_item */ +BTRFS_SETGET_FUNCS(inode_generation, struct btrfs_inode_item, generation, 64); +BTRFS_SETGET_FUNCS(inode_sequence, struct btrfs_inode_item, sequence, 64); +BTRFS_SETGET_FUNCS(inode_transid, struct btrfs_inode_item, transid, 64); +BTRFS_SETGET_FUNCS(inode_size, struct btrfs_inode_item, size, 64); +BTRFS_SETGET_FUNCS(inode_nbytes, struct btrfs_inode_item, nbytes, 64); +BTRFS_SETGET_FUNCS(inode_block_group, struct btrfs_inode_item, block_group, 64); +BTRFS_SETGET_FUNCS(inode_nlink, struct btrfs_inode_item, nlink, 32); +BTRFS_SETGET_FUNCS(inode_uid, struct btrfs_inode_item, uid, 32); +BTRFS_SETGET_FUNCS(inode_gid, struct btrfs_inode_item, gid, 32); +BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32); +BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64); +BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64); +BTRFS_SETGET_STACK_FUNCS(stack_inode_generation, struct btrfs_inode_item, + generation,64 ); +BTRFS_SETGET_STACK_FUNCS(stack_inode_sequence, struct btrfs_inode_item, + sequence,64 ); +BTRFS_SETGET_STACK_FUNCS(stack_inode_transid, struct btrfs_inode_item, + transid,64 ); +BTRFS_SETGET_STACK_FUNCS(stack_inode_size, struct btrfs_inode_item, size, 64); +BTRFS_SETGET_STACK_FUNCS(stack_inode_nbytes, struct btrfs_inode_item, + nbytes,64 ); +BTRFS_SETGET_STACK_FUNCS(stack_inode_block_group, struct btrfs_inode_item, + block_group,64 ); +BTRFS_SETGET_STACK_FUNCS(stack_inode_nlink, struct btrfs_inode_item, nlink, 32); +BTRFS_SETGET_STACK_FUNCS(stack_inode_uid, struct btrfs_inode_item, uid, 32); +BTRFS_SETGET_STACK_FUNCS(stack_inode_gid, struct btrfs_inode_item, gid, 32); +BTRFS_SETGET_STACK_FUNCS(stack_inode_mode, struct btrfs_inode_item, mode, 32); +BTRFS_SETGET_STACK_FUNCS(stack_inode_rdev, struct btrfs_inode_item, rdev, 64); +BTRFS_SETGET_STACK_FUNCS(stack_inode_flags, struct btrfs_inode_item, flags, 64); +BTRFS_SETGET_FUNCS(timespec_sec, struct btrfs_timespec, sec, 64); +BTRFS_SETGET_FUNCS(timespec_nsec, struct btrfs_timespec, nsec, 32); +BTRFS_SETGET_STACK_FUNCS(stack_timespec_sec, struct btrfs_timespec, sec, 64); +BTRFS_SETGET_STACK_FUNCS(stack_timespec_nsec, struct btrfs_timespec, nsec, 32); + +/* struct btrfs_dev_extent */ +BTRFS_SETGET_FUNCS(dev_extent_chunk_tree, struct btrfs_dev_extent, + chunk_tree,64 ); +BTRFS_SETGET_FUNCS(dev_extent_chunk_objectid, struct btrfs_dev_extent, + chunk_objectid,64 ); +BTRFS_SETGET_FUNCS(dev_extent_chunk_offset, struct btrfs_dev_extent, + chunk_offset,64 ); +BTRFS_SETGET_FUNCS(dev_extent_length, struct btrfs_dev_extent, length, 64); +BTRFS_SETGET_FUNCS(extent_refs, struct btrfs_extent_item, refs, 64); +BTRFS_SETGET_FUNCS(extent_generation, struct btrfs_extent_item, + generation,64 ); +BTRFS_SETGET_FUNCS(extent_flags, struct btrfs_extent_item, flags, 64); + +BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8); + +static inline void btrfs_tree_block_key (const struct extent_buffer *eb, +struct btrfs_tree_block_info *item, +struct btrfs_disk_key *key) +{ + read_eb_member(eb, item, struct btrfs_tree_block_info, key, key); +} + +static inline void btrfs_set_tree_block_key (const struct extent_buffer *eb, +struct btrfs_tree_block_info *item, +struct btrfs_disk_key *key) +{ + write_eb_member(eb, item, struct btrfs_tree_block_info, key, key); +} + +BTRFS_SETGET_FUNCS(extent_data_ref_root, struct btrfs_extent_data_ref, + root,64 ); +BTRFS_SETGET_FUNCS(extent_data_ref_objectid, struct btrfs_extent_data_ref, + objectid,64 ); +BTRFS_SETGET_FUNCS(extent_data_ref_offset, struct btrfs_extent_data_ref, + offset,64 ); +BTRFS_SETGET_FUNCS(extent_data_ref_count, struct btrfs_extent_data_ref, + count,32 ); + +BTRFS_SETGET_FUNCS(shared_data_ref_count, struct btrfs_shared_data_ref, + count,32 ); + +BTRFS_SETGET_FUNCS(extent_inline_ref_type, struct btrfs_extent_inline_ref, + type,8 ); +BTRFS_SETGET_FUNCS(extent_inline_ref_offset, struct btrfs_extent_inline_ref, + offset,64 ); + +static inline u32 btrfs_extent_inline_ref_size (int type) +{ +if (type ==BTRFS_TREE_BLOCK_REF_KEY || + type ==BTRFS_SHARED_BLOCK_REF_KEY ) +return sizeof (struct btrfs_extent_inline_ref ); +if (type ==BTRFS_SHARED_DATA_REF_KEY ) +return sizeof (struct btrfs_shared_data_ref ) + +sizeof (struct btrfs_extent_inline_ref ); +if (type ==BTRFS_EXTENT_DATA_REF_KEY ) +return sizeof (struct btrfs_extent_data_ref ) + + offsetof(struct btrfs_extent_inline_ref , offset); +return 0 ; +} + +/* struct btrfs_node */ +BTRFS_SETGET_FUNCS(key_blockptr, struct btrfs_key_ptr, blockptr, 64); +BTRFS_SETGET_FUNCS(key_generation, struct btrfs_key_ptr, generation, 64); +BTRFS_SETGET_STACK_FUNCS(stack_key_blockptr, struct btrfs_key_ptr, + blockptr,64 ); +BTRFS_SETGET_STACK_FUNCS(stack_key_generation, struct btrfs_key_ptr, + generation,64 ); + +static inline u64 btrfs_node_blockptr (const struct extent_buffer *eb,int nr) +{ +unsigned long ptr; + ptr = offsetof(struct btrfs_node , ptrs) + +sizeof (struct btrfs_key_ptr ) * nr; +return btrfs_key_blockptr (eb, (struct btrfs_key_ptr *)ptr); +} + +static inline void btrfs_set_node_blockptr (const struct extent_buffer *eb, +int nr,u64 val) +{ +unsigned long ptr; + ptr = offsetof(struct btrfs_node , ptrs) + +sizeof (struct btrfs_key_ptr ) * nr; +btrfs_set_key_blockptr (eb, (struct btrfs_key_ptr *)ptr, val); +} + +static inline u64 btrfs_node_ptr_generation (const struct extent_buffer *eb,int nr) +{ +unsigned long ptr; + ptr = offsetof(struct btrfs_node , ptrs) + +sizeof (struct btrfs_key_ptr ) * nr; +return btrfs_key_generation (eb, (struct btrfs_key_ptr *)ptr); +} + +static inline void btrfs_set_node_ptr_generation (const struct extent_buffer *eb, +int nr,u64 val) +{ +unsigned long ptr; + ptr = offsetof(struct btrfs_node , ptrs) + +sizeof (struct btrfs_key_ptr ) * nr; +btrfs_set_key_generation (eb, (struct btrfs_key_ptr *)ptr, val); +} + +static inline unsigned long btrfs_node_key_ptr_offset (int nr) +{ +return offsetof(struct btrfs_node , ptrs) + +sizeof (struct btrfs_key_ptr ) * nr; +} + +void btrfs_node_key (const struct extent_buffer *eb, +struct btrfs_disk_key *disk_key,int nr); + +static inline void btrfs_set_node_key (const struct extent_buffer *eb, +struct btrfs_disk_key *disk_key,int nr) +{ +unsigned long ptr; + ptr =btrfs_node_key_ptr_offset (nr); +write_eb_member (eb, (struct btrfs_key_ptr *)ptr, + struct btrfs_key_ptr, key, disk_key); +} + +/* struct btrfs_item */ +BTRFS_SETGET_FUNCS(raw_item_offset, struct btrfs_item, offset, 32); +BTRFS_SETGET_FUNCS(raw_item_size, struct btrfs_item, size, 32); +BTRFS_SETGET_STACK_FUNCS(stack_item_offset, struct btrfs_item, offset, 32); +BTRFS_SETGET_STACK_FUNCS(stack_item_size, struct btrfs_item, size, 32); + +static inline unsigned long btrfs_item_nr_offset (int nr) +{ +return offsetof(struct btrfs_leaf , items) + +sizeof (struct btrfs_item ) * nr; +} + +static inline struct btrfs_item *btrfs_item_nr (int nr) +{ +return (struct btrfs_item *)btrfs_item_nr_offset (nr); +} + +#define BTRFS_ITEM_SETGET_FUNCS (member) \ +static inline u32 btrfs_item_##member(const struct extent_buffer *eb, \ + int slot) \ +{ \ + return btrfs_raw_item_##member(eb, btrfs_item_nr(slot)); \ +} \ +static inline void btrfs_set_item_##member(const struct extent_buffer *eb, \ + int slot, u32 val) \ +{ \ + btrfs_set_raw_item_##member(eb, btrfs_item_nr(slot), val); \ +} \ +static inline u32 btrfs_token_item_##member(struct btrfs_map_token *token, \ + int slot) \ +{ \ + struct btrfs_item *item = btrfs_item_nr(slot); \ + return btrfs_token_raw_item_##member(token, item); \ +} \ +static inline void btrfs_set_token_item_##member(struct btrfs_map_token *token, \ + int slot, u32 val) \ +{ \ + struct btrfs_item *item = btrfs_item_nr(slot); \ + btrfs_set_token_raw_item_##member(token, item, val); \ +} + +BTRFS_ITEM_SETGET_FUNCS (offset) +BTRFS_ITEM_SETGET_FUNCS (size); + +static inline u32 btrfs_item_data_end (const struct extent_buffer *eb,int nr) +{ +return btrfs_item_offset (eb, nr) +btrfs_item_size (eb, nr); +} + +static inline void btrfs_item_key (const struct extent_buffer *eb, +struct btrfs_disk_key *disk_key,int nr) +{ +struct btrfs_item *item =btrfs_item_nr (nr); + read_eb_member(eb, item, struct btrfs_item, key, disk_key); +} + +static inline void btrfs_set_item_key (struct extent_buffer *eb, +struct btrfs_disk_key *disk_key,int nr) +{ +struct btrfs_item *item =btrfs_item_nr (nr); + write_eb_member(eb, item, struct btrfs_item, key, disk_key); +} + +BTRFS_SETGET_FUNCS(dir_log_end, struct btrfs_dir_log_item, end, 64); + +/* +* struct btrfs_root_ref +*/ +BTRFS_SETGET_FUNCS(root_ref_dirid, struct btrfs_root_ref, dirid, 64); +BTRFS_SETGET_FUNCS(root_ref_sequence, struct btrfs_root_ref, sequence, 64); +BTRFS_SETGET_FUNCS(root_ref_name_len, struct btrfs_root_ref, name_len, 16); + +/* struct btrfs_dir_item */ +BTRFS_SETGET_FUNCS(dir_data_len, struct btrfs_dir_item, data_len, 16); +BTRFS_SETGET_FUNCS(dir_type, struct btrfs_dir_item, type, 8); +BTRFS_SETGET_FUNCS(dir_name_len, struct btrfs_dir_item, name_len, 16); +BTRFS_SETGET_FUNCS(dir_transid, struct btrfs_dir_item, transid, 64); +BTRFS_SETGET_STACK_FUNCS(stack_dir_type, struct btrfs_dir_item, type, 8); +BTRFS_SETGET_STACK_FUNCS(stack_dir_data_len, struct btrfs_dir_item, + data_len,16 ); +BTRFS_SETGET_STACK_FUNCS(stack_dir_name_len, struct btrfs_dir_item, + name_len,16 ); +BTRFS_SETGET_STACK_FUNCS(stack_dir_transid, struct btrfs_dir_item, + transid,64 ); + +static inline void btrfs_dir_item_key (const struct extent_buffer *eb, +const struct btrfs_dir_item *item, +struct btrfs_disk_key *key) +{ + read_eb_member(eb, item, struct btrfs_dir_item, location, key); +} + +static inline void btrfs_set_dir_item_key (struct extent_buffer *eb, +struct btrfs_dir_item *item, +const struct btrfs_disk_key *key) +{ + write_eb_member(eb, item, struct btrfs_dir_item, location, key); +} + +BTRFS_SETGET_FUNCS(free_space_entries, struct btrfs_free_space_header, + num_entries,64 ); +BTRFS_SETGET_FUNCS(free_space_bitmaps, struct btrfs_free_space_header, + num_bitmaps,64 ); +BTRFS_SETGET_FUNCS(free_space_generation, struct btrfs_free_space_header, + generation,64 ); + +static inline void btrfs_free_space_key (const struct extent_buffer *eb, +const struct btrfs_free_space_header *h, +struct btrfs_disk_key *key) +{ + read_eb_member(eb, h, struct btrfs_free_space_header, location, key); +} + +static inline void btrfs_set_free_space_key (struct extent_buffer *eb, +struct btrfs_free_space_header *h, +const struct btrfs_disk_key *key) +{ + write_eb_member(eb, h, struct btrfs_free_space_header, location, key); +} + +/* struct btrfs_disk_key */ +BTRFS_SETGET_STACK_FUNCS(disk_key_objectid, struct btrfs_disk_key, + objectid,64 ); +BTRFS_SETGET_STACK_FUNCS(disk_key_offset, struct btrfs_disk_key, offset, 64); +BTRFS_SETGET_STACK_FUNCS(disk_key_type, struct btrfs_disk_key, type, 8); + +#ifdef __LITTLE_ENDIAN + +/* +* Optimized helpers for little-endian architectures where CPU and on-disk +* structures have the same endianness and we can skip conversions. +*/ + +static inline void btrfs_disk_key_to_cpu (struct btrfs_key *cpu_key, +const struct btrfs_disk_key *disk_key) +{ +memcpy (cpu_key, disk_key,sizeof (struct btrfs_key )); +} + +static inline void btrfs_cpu_key_to_disk (struct btrfs_disk_key *disk_key, +const struct btrfs_key *cpu_key) +{ +memcpy (disk_key, cpu_key,sizeof (struct btrfs_key )); +} + +static inline void btrfs_node_key_to_cpu (const struct extent_buffer *eb, +struct btrfs_key *cpu_key,int nr) +{ +struct btrfs_disk_key *disk_key = (struct btrfs_disk_key *)cpu_key; + +btrfs_node_key (eb, disk_key, nr); +} + +static inline void btrfs_item_key_to_cpu (const struct extent_buffer *eb, +struct btrfs_key *cpu_key,int nr) +{ +struct btrfs_disk_key *disk_key = (struct btrfs_disk_key *)cpu_key; + +btrfs_item_key (eb, disk_key, nr); +} + +static inline void btrfs_dir_item_key_to_cpu (const struct extent_buffer *eb, +const struct btrfs_dir_item *item, +struct btrfs_key *cpu_key) +{ +struct btrfs_disk_key *disk_key = (struct btrfs_disk_key *)cpu_key; + +btrfs_dir_item_key (eb, item, disk_key); +} + +#else + +static inline void btrfs_disk_key_to_cpu (struct btrfs_key *cpu, +const struct btrfs_disk_key *disk) +{ + cpu->offset =le64_to_cpu (disk->offset); + cpu->type = disk->type; + cpu->objectid =le64_to_cpu (disk->objectid); +} + +static inline void btrfs_cpu_key_to_disk (struct btrfs_disk_key *disk, +const struct btrfs_key *cpu) +{ + disk->offset =cpu_to_le64 (cpu->offset); + disk->type = cpu->type; + disk->objectid =cpu_to_le64 (cpu->objectid); +} + +static inline void btrfs_node_key_to_cpu (const struct extent_buffer *eb, +struct btrfs_key *key,int nr) +{ +struct btrfs_disk_key disk_key; +btrfs_node_key (eb, &disk_key, nr); +btrfs_disk_key_to_cpu (key, &disk_key); +} + +static inline void btrfs_item_key_to_cpu (const struct extent_buffer *eb, +struct btrfs_key *key,int nr) +{ +struct btrfs_disk_key disk_key; +btrfs_item_key (eb, &disk_key, nr); +btrfs_disk_key_to_cpu (key, &disk_key); +} + +static inline void btrfs_dir_item_key_to_cpu (const struct extent_buffer *eb, +const struct btrfs_dir_item *item, +struct btrfs_key *key) +{ +struct btrfs_disk_key disk_key; +btrfs_dir_item_key (eb, item, &disk_key); +btrfs_disk_key_to_cpu (key, &disk_key); +} + +#endif + +/* struct btrfs_header */ +BTRFS_SETGET_HEADER_FUNCS(header_bytenr, struct btrfs_header, bytenr, 64); +BTRFS_SETGET_HEADER_FUNCS(header_generation, struct btrfs_header, + generation,64 ); +BTRFS_SETGET_HEADER_FUNCS(header_owner, struct btrfs_header, owner, 64); +BTRFS_SETGET_HEADER_FUNCS(header_nritems, struct btrfs_header, nritems, 32); +BTRFS_SETGET_HEADER_FUNCS(header_flags, struct btrfs_header, flags, 64); +BTRFS_SETGET_HEADER_FUNCS(header_level, struct btrfs_header, level, 8); +BTRFS_SETGET_STACK_FUNCS(stack_header_generation, struct btrfs_header, + generation,64 ); +BTRFS_SETGET_STACK_FUNCS(stack_header_owner, struct btrfs_header, owner, 64); +BTRFS_SETGET_STACK_FUNCS(stack_header_nritems, struct btrfs_header, + nritems,32 ); +BTRFS_SETGET_STACK_FUNCS(stack_header_bytenr, struct btrfs_header, bytenr, 64); + +static inline int btrfs_header_flag (const struct extent_buffer *eb,u64 flag) +{ +return (btrfs_header_flags (eb) & flag) == flag; +} + +static inline void btrfs_set_header_flag (struct extent_buffer *eb,u64 flag) +{ +u64 flags =btrfs_header_flags (eb); +btrfs_set_header_flags (eb, flags | flag); +} + +static inline void btrfs_clear_header_flag (struct extent_buffer *eb,u64 flag) +{ +u64 flags =btrfs_header_flags (eb); +btrfs_set_header_flags (eb, flags & ~flag); +} + +static inline int btrfs_header_backref_rev (const struct extent_buffer *eb) +{ +u64 flags =btrfs_header_flags (eb); +return flags >>BTRFS_BACKREF_REV_SHIFT ; +} + +static inline void btrfs_set_header_backref_rev (struct extent_buffer *eb, +int rev) +{ +u64 flags =btrfs_header_flags (eb); + flags &= ~BTRFS_BACKREF_REV_MASK ; + flags |= (u64 )rev <<BTRFS_BACKREF_REV_SHIFT ; +btrfs_set_header_flags (eb, flags); +} + +static inline int btrfs_is_leaf (const struct extent_buffer *eb) +{ +return btrfs_header_level (eb) ==0 ; +} + +/* struct btrfs_root_item */ +BTRFS_SETGET_FUNCS(disk_root_generation, struct btrfs_root_item, + generation,64 ); +BTRFS_SETGET_FUNCS(disk_root_refs, struct btrfs_root_item, refs, 32); +BTRFS_SETGET_FUNCS(disk_root_bytenr, struct btrfs_root_item, bytenr, 64); +BTRFS_SETGET_FUNCS(disk_root_level, struct btrfs_root_item, level, 8); + +BTRFS_SETGET_STACK_FUNCS(root_generation, struct btrfs_root_item, + generation,64 ); +BTRFS_SETGET_STACK_FUNCS(root_bytenr, struct btrfs_root_item, bytenr, 64); +BTRFS_SETGET_STACK_FUNCS(root_drop_level, struct btrfs_root_item, drop_level, 8); +BTRFS_SETGET_STACK_FUNCS(root_level, struct btrfs_root_item, level, 8); +BTRFS_SETGET_STACK_FUNCS(root_dirid, struct btrfs_root_item, root_dirid, 64); +BTRFS_SETGET_STACK_FUNCS(root_refs, struct btrfs_root_item, refs, 32); +BTRFS_SETGET_STACK_FUNCS(root_flags, struct btrfs_root_item, flags, 64); +BTRFS_SETGET_STACK_FUNCS(root_used, struct btrfs_root_item, bytes_used, 64); +BTRFS_SETGET_STACK_FUNCS(root_limit, struct btrfs_root_item, byte_limit, 64); +BTRFS_SETGET_STACK_FUNCS(root_last_snapshot, struct btrfs_root_item, + last_snapshot,64 ); +BTRFS_SETGET_STACK_FUNCS(root_generation_v2, struct btrfs_root_item, + generation_v2,64 ); +BTRFS_SETGET_STACK_FUNCS(root_ctransid, struct btrfs_root_item, + ctransid,64 ); +BTRFS_SETGET_STACK_FUNCS(root_otransid, struct btrfs_root_item, + otransid,64 ); +BTRFS_SETGET_STACK_FUNCS(root_stransid, struct btrfs_root_item, + stransid,64 ); +BTRFS_SETGET_STACK_FUNCS(root_rtransid, struct btrfs_root_item, + rtransid,64 ); + +static inline bool btrfs_root_readonly (const struct btrfs_root *root) +{ +/* Byte-swap the constant at compile time, root_item::flags is LE */ +return (root->root_item.flags &cpu_to_le64 (BTRFS_ROOT_SUBVOL_RDONLY )) !=0 ; +} + +static inline bool btrfs_root_dead (const struct btrfs_root *root) +{ +/* Byte-swap the constant at compile time, root_item::flags is LE */ +return (root->root_item.flags &cpu_to_le64 (BTRFS_ROOT_SUBVOL_DEAD )) !=0 ; +} + +static inline u64 btrfs_root_id (const struct btrfs_root *root) +{ +return root->root_key.objectid; +} + +/* struct btrfs_root_backup */ +BTRFS_SETGET_STACK_FUNCS(backup_tree_root, struct btrfs_root_backup, + tree_root,64 ); +BTRFS_SETGET_STACK_FUNCS(backup_tree_root_gen, struct btrfs_root_backup, + tree_root_gen,64 ); +BTRFS_SETGET_STACK_FUNCS(backup_tree_root_level, struct btrfs_root_backup, + tree_root_level,8 ); + +BTRFS_SETGET_STACK_FUNCS(backup_chunk_root, struct btrfs_root_backup, + chunk_root,64 ); +BTRFS_SETGET_STACK_FUNCS(backup_chunk_root_gen, struct btrfs_root_backup, + chunk_root_gen,64 ); +BTRFS_SETGET_STACK_FUNCS(backup_chunk_root_level, struct btrfs_root_backup, + chunk_root_level,8 ); + +BTRFS_SETGET_STACK_FUNCS(backup_extent_root, struct btrfs_root_backup, + extent_root,64 ); +BTRFS_SETGET_STACK_FUNCS(backup_extent_root_gen, struct btrfs_root_backup, + extent_root_gen,64 ); +BTRFS_SETGET_STACK_FUNCS(backup_extent_root_level, struct btrfs_root_backup, + extent_root_level,8 ); + +BTRFS_SETGET_STACK_FUNCS(backup_fs_root, struct btrfs_root_backup, + fs_root,64 ); +BTRFS_SETGET_STACK_FUNCS(backup_fs_root_gen, struct btrfs_root_backup, + fs_root_gen,64 ); +BTRFS_SETGET_STACK_FUNCS(backup_fs_root_level, struct btrfs_root_backup, + fs_root_level,8 ); + +BTRFS_SETGET_STACK_FUNCS(backup_dev_root, struct btrfs_root_backup, + dev_root,64 ); +BTRFS_SETGET_STACK_FUNCS(backup_dev_root_gen, struct btrfs_root_backup, + dev_root_gen,64 ); +BTRFS_SETGET_STACK_FUNCS(backup_dev_root_level, struct btrfs_root_backup, + dev_root_level,8 ); + +BTRFS_SETGET_STACK_FUNCS(backup_csum_root, struct btrfs_root_backup, + csum_root,64 ); +BTRFS_SETGET_STACK_FUNCS(backup_csum_root_gen, struct btrfs_root_backup, + csum_root_gen,64 ); +BTRFS_SETGET_STACK_FUNCS(backup_csum_root_level, struct btrfs_root_backup, + csum_root_level,8 ); +BTRFS_SETGET_STACK_FUNCS(backup_total_bytes, struct btrfs_root_backup, + total_bytes,64 ); +BTRFS_SETGET_STACK_FUNCS(backup_bytes_used, struct btrfs_root_backup, + bytes_used,64 ); +BTRFS_SETGET_STACK_FUNCS(backup_num_devices, struct btrfs_root_backup, + num_devices,64 ); + +/* struct btrfs_balance_item */ +BTRFS_SETGET_FUNCS(balance_flags, struct btrfs_balance_item, flags, 64); + +static inline void btrfs_balance_data (const struct extent_buffer *eb, +const struct btrfs_balance_item *bi, +struct btrfs_disk_balance_args *ba) +{ + read_eb_member(eb, bi, struct btrfs_balance_item, data, ba); +} + +static inline void btrfs_set_balance_data (struct extent_buffer *eb, +struct btrfs_balance_item *bi, +const struct btrfs_disk_balance_args *ba) +{ + write_eb_member(eb, bi, struct btrfs_balance_item, data, ba); +} + +static inline void btrfs_balance_meta (const struct extent_buffer *eb, +const struct btrfs_balance_item *bi, +struct btrfs_disk_balance_args *ba) +{ + read_eb_member(eb, bi, struct btrfs_balance_item, meta, ba); +} + +static inline void btrfs_set_balance_meta (struct extent_buffer *eb, +struct btrfs_balance_item *bi, +const struct btrfs_disk_balance_args *ba) +{ + write_eb_member(eb, bi, struct btrfs_balance_item, meta, ba); +} + +static inline void btrfs_balance_sys (const struct extent_buffer *eb, +const struct btrfs_balance_item *bi, +struct btrfs_disk_balance_args *ba) +{ + read_eb_member(eb, bi, struct btrfs_balance_item, sys, ba); +} + +static inline void btrfs_set_balance_sys (struct extent_buffer *eb, +struct btrfs_balance_item *bi, +const struct btrfs_disk_balance_args *ba) +{ + write_eb_member(eb, bi, struct btrfs_balance_item, sys, ba); +} + +static inline void +btrfs_disk_balance_args_to_cpu (struct btrfs_balance_args *cpu, +const struct btrfs_disk_balance_args *disk) +{ +memset (cpu,0 ,sizeof (*cpu)); + + cpu->profiles =le64_to_cpu (disk->profiles); + cpu->usage =le64_to_cpu (disk->usage); + cpu->devid =le64_to_cpu (disk->devid); + cpu->pstart =le64_to_cpu (disk->pstart); + cpu->pend =le64_to_cpu (disk->pend); + cpu->vstart =le64_to_cpu (disk->vstart); + cpu->vend =le64_to_cpu (disk->vend); + cpu->target =le64_to_cpu (disk->target); + cpu->flags =le64_to_cpu (disk->flags); + cpu->limit =le64_to_cpu (disk->limit); + cpu->stripes_min =le32_to_cpu (disk->stripes_min); + cpu->stripes_max =le32_to_cpu (disk->stripes_max); +} + +static inline void +btrfs_cpu_balance_args_to_disk (struct btrfs_disk_balance_args *disk, +const struct btrfs_balance_args *cpu) +{ +memset (disk,0 ,sizeof (*disk)); + + disk->profiles =cpu_to_le64 (cpu->profiles); + disk->usage =cpu_to_le64 (cpu->usage); + disk->devid =cpu_to_le64 (cpu->devid); + disk->pstart =cpu_to_le64 (cpu->pstart); + disk->pend =cpu_to_le64 (cpu->pend); + disk->vstart =cpu_to_le64 (cpu->vstart); + disk->vend =cpu_to_le64 (cpu->vend); + disk->target =cpu_to_le64 (cpu->target); + disk->flags =cpu_to_le64 (cpu->flags); + disk->limit =cpu_to_le64 (cpu->limit); + disk->stripes_min =cpu_to_le32 (cpu->stripes_min); + disk->stripes_max =cpu_to_le32 (cpu->stripes_max); +} + +/* struct btrfs_super_block */ +BTRFS_SETGET_STACK_FUNCS(super_bytenr, struct btrfs_super_block, bytenr, 64); +BTRFS_SETGET_STACK_FUNCS(super_flags, struct btrfs_super_block, flags, 64); +BTRFS_SETGET_STACK_FUNCS(super_generation, struct btrfs_super_block, + generation,64 ); +BTRFS_SETGET_STACK_FUNCS(super_root, struct btrfs_super_block, root, 64); +BTRFS_SETGET_STACK_FUNCS (super_sys_array_size, + struct btrfs_super_block, sys_chunk_array_size, 32); +BTRFS_SETGET_STACK_FUNCS (super_chunk_root_generation, + struct btrfs_super_block, chunk_root_generation, 64); +BTRFS_SETGET_STACK_FUNCS(super_root_level, struct btrfs_super_block, + root_level,8 ); +BTRFS_SETGET_STACK_FUNCS(super_chunk_root, struct btrfs_super_block, + chunk_root,64 ); +BTRFS_SETGET_STACK_FUNCS(super_chunk_root_level, struct btrfs_super_block, + chunk_root_level,8 ); +BTRFS_SETGET_STACK_FUNCS(super_log_root, struct btrfs_super_block, + log_root,64 ); +BTRFS_SETGET_STACK_FUNCS(super_log_root_level, struct btrfs_super_block, + log_root_level,8 ); +BTRFS_SETGET_STACK_FUNCS(super_total_bytes, struct btrfs_super_block, + total_bytes,64 ); +BTRFS_SETGET_STACK_FUNCS(super_bytes_used, struct btrfs_super_block, + bytes_used,64 ); +BTRFS_SETGET_STACK_FUNCS(super_sectorsize, struct btrfs_super_block, + sectorsize,32 ); +BTRFS_SETGET_STACK_FUNCS(super_nodesize, struct btrfs_super_block, + nodesize,32 ); +BTRFS_SETGET_STACK_FUNCS(super_stripesize, struct btrfs_super_block, + stripesize,32 ); +BTRFS_SETGET_STACK_FUNCS(super_root_dir, struct btrfs_super_block, + root_dir_objectid,64 ); +BTRFS_SETGET_STACK_FUNCS(super_num_devices, struct btrfs_super_block, + num_devices,64 ); +BTRFS_SETGET_STACK_FUNCS(super_compat_flags, struct btrfs_super_block, + compat_flags,64 ); +BTRFS_SETGET_STACK_FUNCS(super_compat_ro_flags, struct btrfs_super_block, + compat_ro_flags,64 ); +BTRFS_SETGET_STACK_FUNCS(super_incompat_flags, struct btrfs_super_block, + incompat_flags,64 ); +BTRFS_SETGET_STACK_FUNCS(super_csum_type, struct btrfs_super_block, + csum_type,16 ); +BTRFS_SETGET_STACK_FUNCS(super_cache_generation, struct btrfs_super_block, + cache_generation,64 ); +BTRFS_SETGET_STACK_FUNCS(super_magic, struct btrfs_super_block, magic, 64); +BTRFS_SETGET_STACK_FUNCS(super_uuid_tree_generation, struct btrfs_super_block, + uuid_tree_generation,64 ); + +int btrfs_super_csum_size (const struct btrfs_super_block *s); +const char *btrfs_super_csum_name (u16 csum_type); +const char *btrfs_super_csum_driver (u16 csum_type); +size_t __attribute_const__ btrfs_get_num_csums(void); + + +/* +* The leaf data grows from end-to-front in the node. +* this returns the address of the start of the last item, +* which is the stop of the leaf data stack +*/ +static inline unsigned int leaf_data_end (const struct extent_buffer *leaf) +{ +u32 nr =btrfs_header_nritems (leaf); + +if (nr ==0 ) +return BTRFS_LEAF_DATA_SIZE (leaf->fs_info); +return btrfs_item_offset (leaf, nr -1 ); +} + +/* struct btrfs_file_extent_item */ +BTRFS_SETGET_STACK_FUNCS(stack_file_extent_type, struct btrfs_file_extent_item, + type,8 ); +BTRFS_SETGET_STACK_FUNCS (stack_file_extent_disk_bytenr, + struct btrfs_file_extent_item, disk_bytenr, 64); +BTRFS_SETGET_STACK_FUNCS (stack_file_extent_offset, + struct btrfs_file_extent_item, offset, 64); +BTRFS_SETGET_STACK_FUNCS (stack_file_extent_generation, + struct btrfs_file_extent_item, generation, 64); +BTRFS_SETGET_STACK_FUNCS (stack_file_extent_num_bytes, + struct btrfs_file_extent_item, num_bytes, 64); +BTRFS_SETGET_STACK_FUNCS (stack_file_extent_ram_bytes, + struct btrfs_file_extent_item, ram_bytes, 64); +BTRFS_SETGET_STACK_FUNCS (stack_file_extent_disk_num_bytes, + struct btrfs_file_extent_item, disk_num_bytes, 64); +BTRFS_SETGET_STACK_FUNCS (stack_file_extent_compression, + struct btrfs_file_extent_item, compression, 8); + +static inline unsigned long +btrfs_file_extent_inline_start (const struct btrfs_file_extent_item *e) +{ +return (unsigned long )e +BTRFS_FILE_EXTENT_INLINE_DATA_START ; +} + +static inline u32 btrfs_file_extent_calc_inline_size (u32 datasize) +{ +return BTRFS_FILE_EXTENT_INLINE_DATA_START + datasize; +} + +BTRFS_SETGET_FUNCS(file_extent_type, struct btrfs_file_extent_item, type, 8); +BTRFS_SETGET_FUNCS(file_extent_disk_bytenr, struct btrfs_file_extent_item, + disk_bytenr,64 ); +BTRFS_SETGET_FUNCS(file_extent_generation, struct btrfs_file_extent_item, + generation,64 ); +BTRFS_SETGET_FUNCS(file_extent_disk_num_bytes, struct btrfs_file_extent_item, + disk_num_bytes,64 ); +BTRFS_SETGET_FUNCS(file_extent_offset, struct btrfs_file_extent_item, + offset,64 ); +BTRFS_SETGET_FUNCS(file_extent_num_bytes, struct btrfs_file_extent_item, + num_bytes,64 ); +BTRFS_SETGET_FUNCS(file_extent_ram_bytes, struct btrfs_file_extent_item, + ram_bytes,64 ); +BTRFS_SETGET_FUNCS(file_extent_compression, struct btrfs_file_extent_item, + compression,8 ); +BTRFS_SETGET_FUNCS(file_extent_encryption, struct btrfs_file_extent_item, + encryption,8 ); +BTRFS_SETGET_FUNCS(file_extent_other_encoding, struct btrfs_file_extent_item, + other_encoding,16 ); + +/* +* this returns the number of bytes used by the item on disk, minus the +* size of any extent headers. If a file is compressed on disk, this is +* the compressed size +*/ +static inline u32 btrfs_file_extent_inline_item_len ( +const struct extent_buffer *eb, +int nr) +{ +return btrfs_item_size (eb, nr) -BTRFS_FILE_EXTENT_INLINE_DATA_START ; +} + +/* btrfs_qgroup_status_item */ +BTRFS_SETGET_FUNCS(qgroup_status_generation, struct btrfs_qgroup_status_item, + generation,64 ); +BTRFS_SETGET_FUNCS(qgroup_status_version, struct btrfs_qgroup_status_item, + version,64 ); +BTRFS_SETGET_FUNCS(qgroup_status_flags, struct btrfs_qgroup_status_item, + flags,64 ); +BTRFS_SETGET_FUNCS(qgroup_status_rescan, struct btrfs_qgroup_status_item, + rescan,64 ); + +/* btrfs_qgroup_info_item */ +BTRFS_SETGET_FUNCS(qgroup_info_generation, struct btrfs_qgroup_info_item, + generation,64 ); +BTRFS_SETGET_FUNCS(qgroup_info_rfer, struct btrfs_qgroup_info_item, rfer, 64); +BTRFS_SETGET_FUNCS(qgroup_info_rfer_cmpr, struct btrfs_qgroup_info_item, + rfer_cmpr,64 ); +BTRFS_SETGET_FUNCS(qgroup_info_excl, struct btrfs_qgroup_info_item, excl, 64); +BTRFS_SETGET_FUNCS(qgroup_info_excl_cmpr, struct btrfs_qgroup_info_item, + excl_cmpr,64 ); + +BTRFS_SETGET_STACK_FUNCS (stack_qgroup_info_generation, + struct btrfs_qgroup_info_item, generation, 64); +BTRFS_SETGET_STACK_FUNCS(stack_qgroup_info_rfer, struct btrfs_qgroup_info_item, + rfer,64 ); +BTRFS_SETGET_STACK_FUNCS (stack_qgroup_info_rfer_cmpr, + struct btrfs_qgroup_info_item, rfer_cmpr, 64); +BTRFS_SETGET_STACK_FUNCS(stack_qgroup_info_excl, struct btrfs_qgroup_info_item, + excl,64 ); +BTRFS_SETGET_STACK_FUNCS (stack_qgroup_info_excl_cmpr, + struct btrfs_qgroup_info_item, excl_cmpr, 64); + +/* btrfs_qgroup_limit_item */ +BTRFS_SETGET_FUNCS(qgroup_limit_flags, struct btrfs_qgroup_limit_item, + flags,64 ); +BTRFS_SETGET_FUNCS(qgroup_limit_max_rfer, struct btrfs_qgroup_limit_item, + max_rfer,64 ); +BTRFS_SETGET_FUNCS(qgroup_limit_max_excl, struct btrfs_qgroup_limit_item, + max_excl,64 ); +BTRFS_SETGET_FUNCS(qgroup_limit_rsv_rfer, struct btrfs_qgroup_limit_item, + rsv_rfer,64 ); +BTRFS_SETGET_FUNCS(qgroup_limit_rsv_excl, struct btrfs_qgroup_limit_item, + rsv_excl,64 ); + +/* btrfs_dev_replace_item */ +BTRFS_SETGET_FUNCS (dev_replace_src_devid, + struct btrfs_dev_replace_item, src_devid, 64); +BTRFS_SETGET_FUNCS (dev_replace_cont_reading_from_srcdev_mode, + struct btrfs_dev_replace_item, cont_reading_from_srcdev_mode, +64 ); +BTRFS_SETGET_FUNCS(dev_replace_replace_state, struct btrfs_dev_replace_item, + replace_state,64 ); +BTRFS_SETGET_FUNCS(dev_replace_time_started, struct btrfs_dev_replace_item, + time_started,64 ); +BTRFS_SETGET_FUNCS(dev_replace_time_stopped, struct btrfs_dev_replace_item, + time_stopped,64 ); +BTRFS_SETGET_FUNCS(dev_replace_num_write_errors, struct btrfs_dev_replace_item, + num_write_errors,64 ); +BTRFS_SETGET_FUNCS (dev_replace_num_uncorrectable_read_errors, + struct btrfs_dev_replace_item, num_uncorrectable_read_errors, +64 ); +BTRFS_SETGET_FUNCS(dev_replace_cursor_left, struct btrfs_dev_replace_item, + cursor_left,64 ); +BTRFS_SETGET_FUNCS(dev_replace_cursor_right, struct btrfs_dev_replace_item, + cursor_right,64 ); + +BTRFS_SETGET_STACK_FUNCS (stack_dev_replace_src_devid, + struct btrfs_dev_replace_item, src_devid, 64); +BTRFS_SETGET_STACK_FUNCS (stack_dev_replace_cont_reading_from_srcdev_mode, + struct btrfs_dev_replace_item, + cont_reading_from_srcdev_mode,64 ); +BTRFS_SETGET_STACK_FUNCS (stack_dev_replace_replace_state, + struct btrfs_dev_replace_item, replace_state, 64); +BTRFS_SETGET_STACK_FUNCS (stack_dev_replace_time_started, + struct btrfs_dev_replace_item, time_started, 64); +BTRFS_SETGET_STACK_FUNCS (stack_dev_replace_time_stopped, + struct btrfs_dev_replace_item, time_stopped, 64); +BTRFS_SETGET_STACK_FUNCS (stack_dev_replace_num_write_errors, + struct btrfs_dev_replace_item, num_write_errors, 64); +BTRFS_SETGET_STACK_FUNCS (stack_dev_replace_num_uncorrectable_read_errors, + struct btrfs_dev_replace_item, + num_uncorrectable_read_errors,64 ); +BTRFS_SETGET_STACK_FUNCS (stack_dev_replace_cursor_left, + struct btrfs_dev_replace_item, cursor_left, 64); +BTRFS_SETGET_STACK_FUNCS (stack_dev_replace_cursor_right, + struct btrfs_dev_replace_item, cursor_right, 64); + +/* btrfs_verity_descriptor_item */ +BTRFS_SETGET_FUNCS(verity_descriptor_encryption, struct btrfs_verity_descriptor_item, + encryption,8 ); +BTRFS_SETGET_FUNCS(verity_descriptor_size, struct btrfs_verity_descriptor_item, + size,64 ); +BTRFS_SETGET_STACK_FUNCS (stack_verity_descriptor_encryption, + struct btrfs_verity_descriptor_item, encryption, 8); +BTRFS_SETGET_STACK_FUNCS (stack_verity_descriptor_size, + struct btrfs_verity_descriptor_item, size, 64); + +/* helper function to cast into the data area of the leaf. */ +#define btrfs_item_ptr (leaf, slot, type) \ + ((type *)(BTRFS_LEAF_DATA_OFFSET + \ + btrfs_item_offset(leaf, slot))) + +#define btrfs_item_ptr_offset (leaf, slot) \ + ((unsigned long)(BTRFS_LEAF_DATA_OFFSET + \ + btrfs_item_offset(leaf, slot))) +#endif /* BTRFS_ITEM_ACCESSORS_H */
fs/btrfs/backref.c +1 -0
@@ -16,6 +16,7 @@#include "misc.h" #include "tree-mod-log.h" #include "fs.h" +#include "accessors.h" /* Just an arbitrary number so we can be sure this happened */ #define BACKREF_FOUND_SHARED 6
fs/btrfs/block-group.c +1 -0
@@ -18,6 +18,7 @@#include "raid56.h" #include "zoned.h" #include "fs.h" +#include "accessors.h" #ifdef CONFIG_BTRFS_DEBUG int btrfs_should_fragment_free_space (struct btrfs_block_group *block_group)
fs/btrfs/block-rsv.c +1 -0
@@ -8,6 +8,7 @@#include "block-group.h" #include "disk-io.h" #include "fs.h" +#include "accessors.h" /* * HOW DO BLOCK RESERVES WORK
fs/btrfs/check-integrity.c +1 -0
@@ -93,6 +93,7 @@#include "check-integrity.h" #include "rcu-string.h" #include "compression.h" +#include "accessors.h" #define BTRFSIC_BLOCK_HASHTABLE_SIZE 0x10000#define BTRFSIC_BLOCK_LINK_HASHTABLE_SIZE 0x10000
fs/btrfs/ctree.h +0 -1090
1,102 lines not on this page · raw message
fs/btrfs/delayed-inode.c +1 -0
@@ -18,6 +18,7 @@#include "inode-item.h" #include "space-info.h" #include "fs.h" +#include "accessors.h" #define BTRFS_DELAYED_WRITEBACK 512#define BTRFS_DELAYED_BACKGROUND 128
fs/btrfs/dev-replace.c +1 -0
@@ -24,6 +24,7 @@#include "zoned.h" #include "block-group.h" #include "fs.h" +#include "accessors.h" /* * Device replace overview
fs/btrfs/dir-item.c +1 -0
@@ -7,6 +7,7 @@#include "ctree.h" #include "disk-io.h" #include "transaction.h" +#include "accessors.h" /* * insert a name into a directory, doing overflow properly if there is a hash
fs/btrfs/disk-io.c +1 -0
@@ -44,6 +44,7 @@#include "zoned.h" #include "subpage.h" #include "fs.h" +#include "accessors.h" #define BTRFS_SUPER_FLAG_SUPP (BTRFS_HEADER_FLAG_WRITTEN |\ BTRFS_HEADER_FLAG_RELOC |\
fs/btrfs/export.c +1 -0
@@ -7,6 +7,7 @@#include "btrfs_inode.h" #include "print-tree.h" #include "export.h" +#include "accessors.h" #define BTRFS_FID_SIZE_NON_CONNECTABLE (offsetof(struct btrfs_fid, \ parent_objectid) / 4)
fs/btrfs/extent-tree.c +1 -0
@@ -37,6 +37,7 @@#include "zoned.h" #include "dev-replace.h" #include "fs.h" +#include "accessors.h" #undef SCRAMBLE_DELAYED_REFS
fs/btrfs/extent_io.c +1 -0
@@ -31,6 +31,7 @@#include "block-group.h" #include "compression.h" #include "fs.h" +#include "accessors.h" static struct kmem_cache *extent_buffer_cache;
fs/btrfs/file-item.c +1 -0
@@ -18,6 +18,7 @@#include "print-tree.h" #include "compression.h" #include "fs.h" +#include "accessors.h" #define __MAX_CSUM_ITEMS (r, size) ((unsigned long)(((BTRFS_LEAF_DATA_SIZE(r) - \ sizeof(struct btrfs_item) * 2) / \
fs/btrfs/file.c +1 -0
@@ -31,6 +31,7 @@#include "reflink.h" #include "subpage.h" #include "fs.h" +#include "accessors.h" static struct kmem_cache *btrfs_inode_defrag_cachep;/*
fs/btrfs/free-space-cache.c +1 -0
@@ -27,6 +27,7 @@#include "subpage.h" #include "inode-item.h" #include "fs.h" +#include "accessors.h" #define BITS_PER_BITMAP (PAGE_SIZE * 8UL)#define MAX_CACHE_BYTES_PER_GIG SZ_64K
fs/btrfs/free-space-tree.c +1 -0
@@ -13,6 +13,7 @@#include "transaction.h" #include "block-group.h" #include "fs.h" +#include "accessors.h" static int __add_block_group_free_space(struct btrfs_trans_handle *trans, struct btrfs_block_group *block_group,
fs/btrfs/fs.c +1 -0
@@ -3,6 +3,7 @@#include "messages.h" #include "ctree.h" #include "fs.h" +#include "accessors.h" void __btrfs_set_fs_incompat (struct btrfs_fs_info *fs_info,u64 flag,const char *name)
fs/btrfs/inode-item.c +1 -0
@@ -11,6 +11,7 @@#include "transaction.h" #include "print-tree.h" #include "space-info.h" +#include "accessors.h" struct btrfs_inode_ref *btrfs_find_name_in_backref(struct extent_buffer *leaf, int slot, const char *name,
fs/btrfs/ioctl.c +1 -0
@@ -51,6 +51,7 @@#include "block-group.h" #include "subpage.h" #include "fs.h" +#include "accessors.h" #ifdef CONFIG_64BIT /* If we have a 32-bit userspace and 64-bit kernel, then the UAPI
fs/btrfs/locking.c +1 -0
@@ -12,6 +12,7 @@#include "ctree.h" #include "extent_io.h" #include "locking.h" +#include "accessors.h" /* * Lockdep class keys for extent_buffer->lock's in this root. For a given
fs/btrfs/print-tree.c +1 -0
@@ -7,6 +7,7 @@#include "ctree.h" #include "disk-io.h" #include "print-tree.h" +#include "accessors.h" struct root_name_map {u64 id;
fs/btrfs/props.c +1 -0
@@ -13,6 +13,7 @@#include "compression.h" #include "space-info.h" #include "fs.h" +#include "accessors.h" #define BTRFS_PROP_HANDLERS_HT_BITS 8 static DEFINE_HASHTABLE(prop_handlers_ht, BTRFS_PROP_HANDLERS_HT_BITS);
fs/btrfs/qgroup.c +1 -0
@@ -25,6 +25,7 @@#include "sysfs.h" #include "tree-mod-log.h" #include "fs.h" +#include "accessors.h" /* * Helpers to access qgroup reservation
fs/btrfs/ref-verify.c +1 -0
@@ -12,6 +12,7 @@#include "delayed-ref.h" #include "ref-verify.h" #include "fs.h" +#include "accessors.h" /* * Used to keep track the roots and number of refs each root has for a given
fs/btrfs/reflink.c +1 -0
@@ -11,6 +11,7 @@#include "reflink.h" #include "transaction.h" #include "subpage.h" +#include "accessors.h" #define BTRFS_MAX_DEDUPE_LEN SZ_16M
fs/btrfs/relocation.c +1 -0
@@ -29,6 +29,7 @@#include "inode-item.h" #include "space-info.h" #include "fs.h" +#include "accessors.h" /* * Relocation overview
fs/btrfs/root-tree.c +1 -0
@@ -14,6 +14,7 @@#include "qgroup.h" #include "space-info.h" #include "fs.h" +#include "accessors.h" /* * Read a root item from the tree. In case we detect a root item smaller then
fs/btrfs/scrub.c +1 -0
@@ -22,6 +22,7 @@#include "block-group.h" #include "zoned.h" #include "fs.h" +#include "accessors.h" /* * This is only the first step towards a full-features scrub. It reads all
fs/btrfs/send.c +1 -0
@@ -27,6 +27,7 @@#include "compression.h" #include "xattr.h" #include "print-tree.h" +#include "accessors.h" /* * Maximum number of references an extent can have in order for us to attempt to
fs/btrfs/space-info.c +1 -0
@@ -11,6 +11,7 @@#include "block-group.h" #include "zoned.h" #include "fs.h" +#include "accessors.h" /* * HOW DOES SPACE RESERVATION WORK
fs/btrfs/super.c +1 -0
@@ -52,6 +52,7 @@#include "raid56.h" #include "space-info.h" #include "fs.h" +#include "accessors.h" #define CREATE_TRACE_POINTS #include <trace/events/btrfs.h>
fs/btrfs/sysfs.c +1 -0
@@ -24,6 +24,7 @@#include "qgroup.h" #include "misc.h" #include "fs.h" +#include "accessors.h" /* * Structure name Path
fs/btrfs/tests/extent-buffer-tests.c +1 -0
@@ -8,6 +8,7 @@#include "../ctree.h" #include "../extent_io.h" #include "../disk-io.h" +#include "../accessors.h" static int test_btrfs_split_item (u32 sectorsize,u32 nodesize) {
fs/btrfs/tests/free-space-tree-tests.c +1 -0
@@ -10,6 +10,7 @@#include "../free-space-tree.h" #include "../transaction.h" #include "../block-group.h" +#include "../accessors.h" struct free_space_extent {u64 start;
fs/btrfs/tests/inode-tests.c +1 -0
@@ -11,6 +11,7 @@#include "../extent_io.h" #include "../volumes.h" #include "../compression.h" +#include "../accessors.h" static void insert_extent(struct btrfs_root *root, u64 start, u64 len, u64 ram_bytes, u64 offset, u64 disk_bytenr,
fs/btrfs/tests/qgroup-tests.c +1 -0
@@ -11,6 +11,7 @@#include "../qgroup.h" #include "../backref.h" #include "../fs.h" +#include "../accessors.h" static int insert_normal_tree_ref (struct btrfs_root *root,u64 bytenr,u64 num_bytes,u64 parent,u64 root_objectid)
fs/btrfs/transaction.c +1 -0
@@ -24,6 +24,7 @@#include "space-info.h" #include "zoned.h" #include "fs.h" +#include "accessors.h" static struct kmem_cache *btrfs_trans_handle_cachep;
fs/btrfs/tree-checker.c +1 -0
@@ -27,6 +27,7 @@#include "misc.h" #include "btrfs_inode.h" #include "fs.h" +#include "accessors.h" /* * Error message should follow the following format:
fs/btrfs/tree-defrag.c +1 -0
@@ -9,6 +9,7 @@#include "print-tree.h" #include "transaction.h" #include "locking.h" +#include "accessors.h" /* * Defrag all the leaves in a given btree.
fs/btrfs/tree-mod-log.c +1 -0
@@ -4,6 +4,7 @@#include "tree-mod-log.h" #include "disk-io.h" #include "fs.h" +#include "accessors.h" struct tree_mod_root {u64 logical;
fs/btrfs/uuid-tree.c +1 -1
@@ -11,7 +11,7 @@#include "disk-io.h" #include "print-tree.h" #include "fs.h" - +#include "accessors.h" static void btrfs_uuid_to_key (u8 *uuid,u8 type,struct btrfs_key *key) {
fs/btrfs/verity.c +1 -0
@@ -17,6 +17,7 @@#include "disk-io.h" #include "locking.h" #include "fs.h" +#include "accessors.h" /* * Implementation of the interface defined in struct fsverity_operations.
fs/btrfs/volumes.c +1 -0
@@ -34,6 +34,7 @@#include "discard.h" #include "zoned.h" #include "fs.h" +#include "accessors.h" static struct bio_set btrfs_bioset;
fs/btrfs/xattr.c +1 -0
@@ -21,6 +21,7 @@#include "disk-io.h" #include "props.h" #include "locking.h" +#include "accessors.h" int btrfs_getxattr (struct inode *inode,const char *name,void *buffer,size_t size)
fs/btrfs/zoned.c +1 -0
@@ -16,6 +16,7 @@#include "dev-replace.h" #include "space-info.h" #include "fs.h" +#include "accessors.h" /* Maximum number of zones to report per blkdev_report_zones() call */ #define BTRFS_REPORT_NR_ZONES 4096
Signature · 1 line
2.26.3
PATCH v3 15/15 btrfs: remove temporary btrfs_map_token declaration in ctree.h
In reply to Josef BacikThis was added while I was moving this code to its new home, it can be removed now.
--- fs/btrfs/ctree.h | 2 -- 1 file changed, 2 deletions(-)
fs/btrfs/ctree.h +0 -2
@@ -51,8 +51,6 @@ struct btrfs_balance_control;struct btrfs_delayed_root ;struct reloc_control ; -struct btrfs_map_token ; -#define BTRFS_OLDEST_GENERATION 0ULL#define BTRFS_EMPTY_DIR_SIZE 0
Signature · 1 line
2.26.3
PATCH v3 12/15 btrfs: rename struct-funcs.c -> accessors.c
In reply to Josef BacikRename struct-funcs.c to accessors.c so we can move the item accessors out of ctree.h. accessors.c is a better description of the code that is contained in these files.
---
fs/btrfs/Makefile | 2 +-
fs/btrfs/{struct-funcs.c => accessors.c} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename fs/btrfs/{struct-funcs.c => accessors.c} (100%)fs/btrfs/Makefile +1 -1
@@ -24,7 +24,7 @@ obj-$(CONFIG_BTRFS_FS) := btrfs.o btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ file-item.o inode-item.o disk-io.o \ transaction.o inode.o file.o tree-defrag.o \ - extent_map.o sysfs.o struct-funcs.o xattr.o ordered-data.o \ + extent_map.o sysfs.o accessors.o xattr.o ordered-data.o \ extent_io.o volumes.o async-thread.o ioctl.o locking.o orphan.o \ export.o tree-log.o free-space-cache.o zlib.o lzo.o zstd.o \ compression.o delayed-ref.o relocation.o delayed-inode.o scrub.o \
fs/btrfs/accessors.c renamed from fs/btrfs/struct-funcs.c +0 -0
Signature · 1 line
2.26.3
PATCH v3 11/15 btrfs: move the compat/incompat flag masks to fs.h
In reply to Josef BacikThis is fs wide information, move it out of ctree.h into fs.h.
--- fs/btrfs/ctree.h | 57 ------------------------------------------------ fs/btrfs/fs.h | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 57 deletions(-)
fs/btrfs/ctree.h +0 -57
@@ -70,63 +70,6 @@ static_assert(sizeof(struct btrfs_super_block) == BTRFS_SUPER_INFO_SIZE);*/ #define BTRFS_DEVICE_RANGE_RESERVED (SZ_1M) -/* -* Compat flags that we support. If any incompat flags are set other than the -* ones specified below then we will fail to mount -*/ -#define BTRFS_FEATURE_COMPAT_SUPP 0ULL -#define BTRFS_FEATURE_COMPAT_SAFE_SET 0ULL -#define BTRFS_FEATURE_COMPAT_SAFE_CLEAR 0ULL - -#define BTRFS_FEATURE_COMPAT_RO_SUPP \ - (BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE | \ - BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE_VALID | \ - BTRFS_FEATURE_COMPAT_RO_VERITY | \ - BTRFS_FEATURE_COMPAT_RO_BLOCK_GROUP_TREE) - -#define BTRFS_FEATURE_COMPAT_RO_SAFE_SET 0ULL -#define BTRFS_FEATURE_COMPAT_RO_SAFE_CLEAR 0ULL - -#ifdef CONFIG_BTRFS_DEBUG -/* -* Extent tree v2 supported only with CONFIG_BTRFS_DEBUG -*/ -#define BTRFS_FEATURE_INCOMPAT_SUPP \ - (BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF | \ - BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL | \ - BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS | \ - BTRFS_FEATURE_INCOMPAT_BIG_METADATA | \ - BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO | \ - BTRFS_FEATURE_INCOMPAT_COMPRESS_ZSTD | \ - BTRFS_FEATURE_INCOMPAT_RAID56 | \ - BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF | \ - BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA | \ - BTRFS_FEATURE_INCOMPAT_NO_HOLES | \ - BTRFS_FEATURE_INCOMPAT_METADATA_UUID | \ - BTRFS_FEATURE_INCOMPAT_RAID1C34 | \ - BTRFS_FEATURE_INCOMPAT_ZONED | \ - BTRFS_FEATURE_INCOMPAT_EXTENT_TREE_V2) -#else -#define BTRFS_FEATURE_INCOMPAT_SUPP \ - (BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF | \ - BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL | \ - BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS | \ - BTRFS_FEATURE_INCOMPAT_BIG_METADATA | \ - BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO | \ - BTRFS_FEATURE_INCOMPAT_COMPRESS_ZSTD | \ - BTRFS_FEATURE_INCOMPAT_RAID56 | \ - BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF | \ - BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA | \ - BTRFS_FEATURE_INCOMPAT_NO_HOLES | \ - BTRFS_FEATURE_INCOMPAT_METADATA_UUID | \ - BTRFS_FEATURE_INCOMPAT_RAID1C34 | \ - BTRFS_FEATURE_INCOMPAT_ZONED) -#endif - -#define BTRFS_FEATURE_INCOMPAT_SAFE_SET \ - (BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF) -#define BTRFS_FEATURE_INCOMPAT_SAFE_CLEAR 0ULL -/* Read ahead values for struct btrfs_path.reada */ enum {READA_NONE ,
fs/btrfs/fs.h +57 -0
63 lines not on this page · raw message
Signature · 1 line
2.26.3
Re: [PATCH v3 01/15] btrfs: move fs wide helpers out of ctree.h
In reply to Josef BacikLooks good,
Re: [PATCH v3 02/15] btrfs: move assert helpers out of ctree.h
In reply to Josef BacikLooks good,
Re: [PATCH v3 03/15] btrfs: move the printk helpers out of ctree.h
In reply to Josef BacikLooks good,
Re: [PATCH v3 13/15] btrfs: move btrfs_map_token to accessors
In reply to Josef BacikLooks good,
Re: [PATCH v3 15/15] btrfs: remove temporary btrfs_map_token declaration in ctree.h
In reply to Josef BacikLooks good,
Re: [PATCH v3 02/15] btrfs: move assert helpers out of ctree.h
In reply to Josef BacikQuoted 15 lines · Josef Bacik
These call functions that aren't defined in, or will be moved out of,
ctree.hMove them tosuper.cwhere the other assert/error message code is defined.Signed-off-by Josef Bacik <[email protected]>--- fs/btrfs/ctree.h | 18 +++--------------- fs/btrfs/super.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 15 deletions(-)fs/btrfs/ctree.h +0
-0
fs/btrfs/ctree.h do { \ · line 3323
Quoted 4 lines
fs/btrfs/ctree.h +0
-1@@ -3320,18 +3320,11 @@ do { \ }while (0 ) #ifdef CONFIG_BTRFS_ASSERT -__cold __noreturn
I think __noreturn should be preserved as BUG() is called in the new function too
Quoted 11 lines
fs/btrfs/ctree.h +5
-5-static inline void assertfail (const char *expr,const char *file,int line) -{ -pr_err ("assertion failed: %s, in %s:%d\n" , expr, file, line); -BUG (); -} +void __cold btrfs_assertfail (const char *expr,const char *file,int line) +{ +pr_err ("assertion failed: %s, in %s:%d\n" , expr, file, line); +BUG (); +}
Re: [PATCH v3 02/15] btrfs: move assert helpers out of ctree.h
Quoted 18 lines · David Sterba
Quoted 17 lines · Josef Bacik
These call functions that aren't defined in, or will be moved out of,
ctree.hMove them tosuper.cwhere the other assert/error message code is defined.Signed-off-by Josef Bacik <[email protected]>--- fs/btrfs/ctree.h | 18 +++--------------- fs/btrfs/super.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 15 deletions(-)fs/btrfs/ctree.h +0
-0@@ -3320,18 +3320,11 @@ do { \ }while (0 )
Quoted 5 lines
fs/btrfs/ctree.h do { \ · line 3323
Quoted 2 lines
fs/btrfs/ctree.h +0
-1#ifdef CONFIG_BTRFS_ASSERT -__cold __noreturn I think
__noreturnshould be preserved asBUG()is called in the new function too
But objtool for some reason does not like it, tons of warnings like
fs/btrfs/dir-item.o: warning: objtool: .text.unlikely: unexpected end of section fs/btrfs/xattr.o: warning: objtool: btrfs_setxattr() falls through to next function btrfs_setxattr_trans.cold() fs/btrfs/xattr.o: warning: objtool: .text.unlikely: unexpected end of section
so I'll drop the attribute.
Quoted 52 lines · Josef Bacik
v2->v3:
- Merged the moving of the printk helpers out ofctree.hand then moving some of the larger helpers into their own c file into one patch.
- Moved the assert helper patch to before the printk moving patch so I don't move the code twice.
- Adjusted the commit log to indicate I was un-inlining thebtrfs_map_token_initfunciton.
- Added some missing newlines at the end of headers.
v1->v2:
- renamedbtrfs-printk.hand item-accessors.* tomessages.hand accessors.*.
- I dropped "btrfs: push extra checks into__btrfs_abort_transaction" so theWARN_ONwould be where the abort happens.
- I reworked the incompat/compat get helpers to be defines instead of inlines to maintain the faster code instead of un-inlining the helper, and this way we have a little better header cleanliness.
- I gave up on my idea of having headers able to be included at any order at this point and made sure everything was included in the proper order. Once things are completely split out we can go back through and try to make all the header files as clean as possible.--- Original email ---
Hello,This series is based on the series
btrfs: initial
ctree.hcleanups, simple stuffwhich needs to be in place before applying these patches.
This is likely going to have the largest patch of the series, which bulk moves all of the struct funcs defines out of
ctree.hinto their own file. This isn't really possible to do piecemeal like other changes because we're using macros instead of functions. However the code is well organized so it allows for a bulk copy and paste, so is straightforward.I've done my best with naming, but I'm open to suggestions. My general plan is to have all fs wide definitions in
fs.h, and then separate out individual things to their own headers.The biggest things I've done in this series are
1. Move the printk helpers into their own files.
2. Move the main state flags and core fs helpers into their own files.
3. Moved the struct func definitions to their own files.This is by no means complete, this is just the first big pass, but as you can see is already 17 patches long. Subsequent patches will move more code and do more cleanups. Thanks,
Josef
Quoted 16 lines
Josef Bacik (15):
btrfs: move fs wide helpers out ofctree.h
btrfs: move assert helpers out ofctree.h
btrfs: move the printk helpers out ofctree.h
btrfs: push printk index code into their respective helpers
btrfs: move BTRFS_FS_STATE* defs and helpers tofs.h
btrfs: convert incompat and compat flag test helpers to defines
btrfs: move mount option definitions tofs.h
btrfs: movefs_info->flagsenum tofs.h
btrfs: add aBTRFS_FS_NEED_TRANS_COMMITflag
btrfs: removefs_info::pending_changesand related code
btrfs: move the compat/incompat flag masks tofs.h
btrfs: renamestruct-funcs.c->accessors.c
btrfs: movebtrfs_map_tokento accessors
btrfs: move accessor helpers intoaccessors.h
btrfs: remove temporarybtrfs_map_tokendeclaration inctree.h
Merged to misc-next with some minor fixups. This will likely lead to some patch conflicts but let's say we do such broad changes at rc3 at the latest so we have enough time left to rebase and test any non-cleanup changes.
Re: [PATCH v3 09/15] btrfs: add a BTRFS_FS_NEED_TRANS_COMMIT flag
In reply to Josef BacikQuoted 7 lines · Josef Bacik
Currently we are only using
fs_info->pending_changesto indicate that we need a transaction commit. The original users for this were removed years ago, so this is the only remaining reason to have this field. Add a flag so we can remove this code.Reviewed-by Johannes Thumshirn <[email protected]>Signed-off-by Josef Bacik <[email protected]>
Why did we miss my rb though some of the patches have no code-change, for example this patch.
Hm. Let's move on. Copying RB from v1.
Quoted 70 lines
--- fs/btrfs/fs.h | 3 +++ fs/btrfs/super.c | 3 ++- fs/btrfs/sysfs.c | 4 ++-- fs/btrfs/transaction.c | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-)fs/btrfs/fs.h +3
-0@@ -90,6 +90,9 @@ enum {/* Indicate we have to finish a zone to do next allocation. */ BTRFS_FS_NEED_ZONE_FINISH , +/* Indicate that we want to commit the transaction. */ +BTRFS_FS_NEED_TRANS_COMMIT , + #if BITS_PER_LONG == 32/* Indicate if we have error/warn message printed on 32bit systems */ BTRFS_FS_32BIT_ERROR,fs/btrfs/super.c +2
-1@@ -1534,7 +1534,8 @@ int btrfs_sync_fs(struct super_block *sb, int wait)* Exit unless we have some pending changes * that need to go through commit */ -if (fs_info->pending_changes ==0 ) +if (!test_bit (BTRFS_FS_NEED_TRANS_COMMIT , + &fs_info->flags))return 0 ;/* * A non-blocking test if the fs is frozen. We must not fs/btrfs/sysfs.c +2
-2@@ -250,7 +250,7 @@ static ssize_t btrfs_feature_attr_store(struct kobject *kobj,/* * We don't want to do full transaction commit from inside sysfs */ -btrfs_set_pending (fs_info,COMMIT ); +set_bit (BTRFS_FS_NEED_TRANS_COMMIT , &fs_info->flags);wake_up_process (fs_info->transaction_kthread);return count;@@ -961,7 +961,7 @@ static ssize_t btrfs_label_store(struct kobject *kobj,/* * We don't want to do full transaction commit from inside sysfs */ -btrfs_set_pending (fs_info,COMMIT ); +set_bit (BTRFS_FS_NEED_TRANS_COMMIT , &fs_info->flags);wake_up_process (fs_info->transaction_kthread);return len;fs/btrfs/transaction.c +2
-0@@ -2104,6 +2104,8 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)ASSERT (refcount_read (&trans->use_count) ==1 );btrfs_trans_state_lockdep_acquire (fs_info,BTRFS_LOCKDEP_TRANS_COMMIT_START ); +clear_bit (BTRFS_FS_NEED_TRANS_COMMIT , &fs_info->flags); +/* Stop the commit early if ->aborted is set */ if (TRANS_ABORTED (cur_trans)) { ret = cur_trans->aborted;
Re: [PATCH v3 01/15] btrfs: move fs wide helpers out of ctree.h
In reply to Josef BacikQuoted 7 lines · Josef Bacik
We have several fs wide related helpers in
ctree.h. The bulk of these are the incompat flag test helpers, but there are things such asbtrfs_fs_closing()and the read only helpers that also aren't directly related to the ctree code. Move these into afs.hheader, which will serve as the location for file system wide related helpers.Signed-off-by Josef Bacik <[email protected]>
Re: [PATCH v3 08/15] btrfs: move fs_info->flags enum to fs.h
In reply to Josef BacikQuoted 5 lines · Josef Bacik
These definitions are fs wide, take them out of
ctree.hand put them infs.h.Reviewed-by Johannes Thumshirn <[email protected]>Signed-off-by Josef Bacik <[email protected]>
Same as v1. Except missing RB.
Re: [PATCH v3 07/15] btrfs: move mount option definitions to fs.h
In reply to Josef BacikQuoted 5 lines · Josef Bacik
These are fs wide definitions and helpers, move them out of
ctree.hand intofs.h.Reviewed-by Johannes Thumshirn <[email protected]>Signed-off-by Josef Bacik <[email protected]>
Same as v1.
Re: [PATCH v3 09/15] btrfs: add a BTRFS_FS_NEED_TRANS_COMMIT flag
In reply to Anand JainQuoted 11 lines · Anand Jain
Quoted 7 lines · Josef Bacik
Currently we are only using
fs_info->pending_changesto indicate that we need a transaction commit. The original users for this were removed years ago, so this is the only remaining reason to have this field. Add a flag so we can remove this code.Reviewed-by Johannes Thumshirn <[email protected]>Signed-off-by Josef Bacik <[email protected]>Why did we miss my rb though some of the patches have no code-change, for example this patch.
I'll add it for final merge.
Re: [PATCH v3 11/15] btrfs: move the compat/incompat flag masks to fs.h
In reply to Josef BacikQuoted 4 lines · Josef Bacik
This is fs wide information, move it out of
ctree.hintofs.h.Reviewed-by Johannes Thumshirn <[email protected]>Signed-off-by Josef Bacik <[email protected]>
Same as v1. missing rb.
Re: [PATCH v3 10/15] btrfs: remove fs_info::pending_changes and related code
In reply to Josef BacikQuoted 5 lines · Josef Bacik
Now that we're not using this code anywhere we can remove it as well as the member from
fs_info.Reviewed-by Johannes Thumshirn <[email protected]>Signed-off-by Josef Bacik <[email protected]>
Same as v1.
Re: [PATCH v3 15/15] btrfs: remove temporary btrfs_map_token declaration in ctree.h
In reply to Josef Baciksame as v1.
Re: [PATCH v3 12/15] btrfs: rename struct-funcs.c -> accessors.c
In reply to Josef BacikQuoted 6 lines · Josef Bacik
Rename
struct-funcs.ctoaccessors.cso we can move the item accessors out ofctree.h.accessors.cis a better description of the code that is contained in these files.Reviewed-by Johannes Thumshirn <[email protected]>Signed-off-by Josef Bacik <[email protected]>