| Message ID | 20191024023636.21124-5-marcos.souza.org@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs: send uevent on subvolume add/remove | expand |
On Thu, Oct 24, 2019 at 7:56 PM Marcos Paulo de Souza <marcos.souza.org@gmail.com> wrote: > > From: Marcos Paulo de Souza <mpdesouza@suse.com> > > This new function takes a btrfs_root as argument, and returns true is > root_key.offset is bigger than 0, meaning that this tree is a snapshot. > > This new function will be used by the next patch. > > Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com> > --- > fs/btrfs/ctree.h | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h > index 19d669d12ca1..8502e9082914 100644 > --- a/fs/btrfs/ctree.h > +++ b/fs/btrfs/ctree.h > @@ -3411,6 +3411,20 @@ static inline int btrfs_defrag_cancelled(struct btrfs_fs_info *fs_info) > return signal_pending(current); > } > > +/* > + * btrfs_is_snapshot() - Verify is a tree is a snapshot > + * @root: btrfs_root > + * > + * When the key.offset field of btrfs_root is bigger than 0 it means the referred > + * tree is a snapshot. > + * > + * Returns true if @root refers to a snapshot. > + */ > +static inline bool btrfs_is_snapshot(struct btrfs_root *root) > +{ > + return root->root_key.offset > 0; So this is not true for all roots. For log roots and relocation roots for example, which are not snapshots, the offset corresponds to the objectid of the root they are associated to. So this isn't generic enough to have in ctree.h, and will create confusion or potential bugs if anyone tries to use it in the future. Since you only use this function in a later patch at the subvolume/deletion ioctl, I would suggest using this directly in that code only, as there this assumption is true, since user space can't reference a log or relocation tree in the ioctl call. Thanks. > +} > + > #define in_range(b, first, len) ((b) >= (first) && (b) < (first) + (len)) > > /* Sanity test specific functions */ > -- > 2.23.0 >
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 19d669d12ca1..8502e9082914 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3411,6 +3411,20 @@ static inline int btrfs_defrag_cancelled(struct btrfs_fs_info *fs_info) return signal_pending(current); } +/* + * btrfs_is_snapshot() - Verify is a tree is a snapshot + * @root: btrfs_root + * + * When the key.offset field of btrfs_root is bigger than 0 it means the referred + * tree is a snapshot. + * + * Returns true if @root refers to a snapshot. + */ +static inline bool btrfs_is_snapshot(struct btrfs_root *root) +{ + return root->root_key.offset > 0; +} + #define in_range(b, first, len) ((b) >= (first) && (b) < (first) + (len)) /* Sanity test specific functions */