Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

btrfs: annotate quota tree for lockdep 



Quota tree has been missing from lockdep annotations, though no warning
has been seen in the wild.

There's currently one entry that does not belong there,
BTRFS_ORPHAN_OBJECTID.  No such tree exists, it's probably a copy &
paste mistake, the id is defined among tree ids.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent 667e7d94

fs/btrfs/ctree.h

+3 −3
Original line number Diff line number Diff line
@@ -88,12 +88,12 @@ struct btrfs_ordered_sum; 
/* holds checksums of all the data extents */

#define BTRFS_CSUM_TREE_OBJECTID 7ULL



/* for storing balance parameters in the root tree */

#define BTRFS_BALANCE_OBJECTID -4ULL



/* holds quota configuration and tracking */

#define BTRFS_QUOTA_TREE_OBJECTID 8ULL



/* for storing balance parameters in the root tree */

#define BTRFS_BALANCE_OBJECTID -4ULL



/* orhpan objectid for tracking unlinked/truncated files */

#define BTRFS_ORPHAN_OBJECTID -5ULL

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static struct btrfs_lockdep_keyset { 
	{ .id = BTRFS_DEV_TREE_OBJECTID,	.name_stem = "dev"	},

	{ .id = BTRFS_FS_TREE_OBJECTID,		.name_stem = "fs"	},

	{ .id = BTRFS_CSUM_TREE_OBJECTID,	.name_stem = "csum"	},

	{ .id = BTRFS_ORPHAN_OBJECTID,		.name_stem = "orphan"	},

	{ .id = BTRFS_QUOTA_TREE_OBJECTID,	.name_stem = "quota"	},

	{ .id = BTRFS_TREE_LOG_OBJECTID,	.name_stem = "log"	},

	{ .id = BTRFS_TREE_RELOC_OBJECTID,	.name_stem = "treloc"	},

	{ .id = BTRFS_DATA_RELOC_TREE_OBJECTID,	.name_stem = "dreloc"	},