btrfs: add filesystem generation to FS_INFO ioctl

Add retrieval of the filesystem's generation to the fsinfo ioctl. This is
driven by setting the BTRFS_FS_INFO_FLAG_GENERATION flag in
btrfs_ioctl_fs_info_args::flags.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 2854f4a4078787ab4a8b7474fc99ec921434ddf2..55dd20d0f9cb75a20bfd31deff529ab85825b64e 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -3247,6 +3247,11 @@ static long btrfs_ioctl_fs_info(struct btrfs_fs_info *fs_info,
                fi_args->flags |= BTRFS_FS_INFO_FLAG_CSUM_INFO;
        }
 
+       if (flags_in & BTRFS_FS_INFO_FLAG_GENERATION) {
+               fi_args->generation = fs_info->generation;
+               fi_args->flags |= BTRFS_FS_INFO_FLAG_GENERATION;
+       }
+
        if (copy_to_user(arg, fi_args, sizeof(*fi_args)))
                ret = -EFAULT;
 

diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h
index 24f6848ad78ec71ece8f41d51229afd6383cf577..9b82e01c191d165a3f04dceaf1791193e97ad962 100644 (file)
--- a/include/uapi/linux/btrfs.h
+++ b/include/uapi/linux/btrfs.h
@@ -250,6 +250,9 @@ struct btrfs_ioctl_dev_info_args {
 /* Request information about checksum type and size */
 #define BTRFS_FS_INFO_FLAG_CSUM_INFO                   (1 << 0)
 
+/* Request information about filesystem generation */
+#define BTRFS_FS_INFO_FLAG_GENERATION                  (1 << 1)
+
 struct btrfs_ioctl_fs_info_args {
        __u64 max_id;                           /* out */
        __u64 num_devices;                      /* out */
@@ -261,7 +264,8 @@ struct btrfs_ioctl_fs_info_args {
        __u16 csum_type;                        /* out */
        __u16 csum_size;                        /* out */
        __u64 flags;                            /* in/out */
-       __u8 reserved[968];                     /* pad to 1k */
+       __u64 generation;                       /* out */
+       __u8 reserved[960];                     /* pad to 1k */
 };
 
 /*