summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ctree.h
diff options
context:
space:
mode:
authorDavid Sterba2014-02-05 15:26:17 +0100
committerDavid Sterba2014-11-12 16:53:13 +0100
commit7e1876aca815029d5c3023a66a91e249eca3e533 (patch)
tree95b45315399590654ef882d2f55cb9944d732598 /fs/btrfs/ctree.h
parentbtrfs: do commit in sync_fs if there are pending changes (diff)
downloadkernel-qcow2-linux-7e1876aca815029d5c3023a66a91e249eca3e533.tar.gz
kernel-qcow2-linux-7e1876aca815029d5c3023a66a91e249eca3e533.tar.xz
kernel-qcow2-linux-7e1876aca815029d5c3023a66a91e249eca3e533.zip
btrfs: switch inode_cache option handling to pending changes
The pending mount option(s) now share namespace and bits with the normal options, and the existing one for (inode_cache) is unset unconditionally at each transaction commit. Introduce a separate namespace for pending changes and enhance the descriptions of the intended change to use separate bits for each action. Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs/btrfs/ctree.h')
-rw-r--r--fs/btrfs/ctree.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index f30b061ef77d..1c9157e4ab0c 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2098,7 +2098,6 @@ struct btrfs_ioctl_defrag_range_args {
#define BTRFS_MOUNT_CHECK_INTEGRITY_INCLUDING_EXTENT_DATA (1 << 21)
#define BTRFS_MOUNT_PANIC_ON_FATAL_ERROR (1 << 22)
#define BTRFS_MOUNT_RESCAN_UUID_TREE (1 << 23)
-#define BTRFS_MOUNT_CHANGE_INODE_CACHE (1 << 24)
#define BTRFS_DEFAULT_COMMIT_INTERVAL (30)
#define BTRFS_DEFAULT_MAX_INLINE (8192)
@@ -2131,6 +2130,9 @@ struct btrfs_ioctl_defrag_range_args {
* transaction commit)
*/
+#define BTRFS_PENDING_SET_INODE_MAP_CACHE (0)
+#define BTRFS_PENDING_CLEAR_INODE_MAP_CACHE (1)
+
#define btrfs_test_pending(info, opt) \
test_bit(BTRFS_PENDING_##opt, &(info)->pending_changes)
#define btrfs_set_pending(info, opt) \