statx: stx_vol
PATCH 1/1 statx: stx_vol
Add a new statx field for (sub)volume identifiers.
This includes bcachefs support; we'll definitely want btrfs support as well.
--- fs/bcachefs/fs.c | 3 +++ fs/stat.c | 1 + include/linux/stat.h | 1 + include/uapi/linux/stat.h | 4 +++- 4 files changed, 8 insertions(+), 1 deletion(-)
fs/bcachefs/fs.c +3 -0
@@ -840,6 +840,9 @@ static int bch2_getattr(struct mnt_idmap *idmap, stat->blksize =block_bytes (c); stat->blocks = inode->v.i_blocks; + stat->vol = inode->ei_subvol; + stat->result_mask |=STATX_VOL ; +if (request_mask &STATX_BTIME ) { stat->result_mask |=STATX_BTIME ; stat->btime =bch2_time_to_timespec (c, inode->ei_inode.bi_otime);
fs/stat.c +1 -0
@@ -658,6 +658,7 @@ cp_statx(const struct kstat *stat, struct statx __user *buffer) tmp.stx_mnt_id = stat->mnt_id; tmp.stx_dio_mem_align = stat->dio_mem_align; tmp.stx_dio_offset_align = stat->dio_offset_align; + tmp.stx_vol = stat->vol;return copy_to_user (buffer, &tmp,sizeof (tmp)) ? -EFAULT :0 ; }
include/linux/stat.h +1 -0
@@ -53,6 +53,7 @@ struct kstat {u32 dio_mem_align;u32 dio_offset_align;u64 change_cookie; +u64 vol; };/* These definitions are internal to the kernel for now. Mainly used by nfsd. */
include/uapi/linux/stat.h +3 -1
@@ -126,8 +126,9 @@ struct statx {__u64 stx_mnt_id;__u32 stx_dio_mem_align;/* Memory buffer alignment for direct I/O */ __u32 stx_dio_offset_align;/* File offset alignment for direct I/O */ +__u64 stx_vol;/* Subvolume identifier */ /* 0xa0 */ -__u64 __spare3[12 ];/* Spare space for future expansion */ +__u64 __spare3[11 ];/* Spare space for future expansion */ /* 0x100 */ };
@@ -155,6 +156,7 @@ struct statx {#define STATX_MNT_ID 0x00001000U/* Got stx_mnt_id */ #define STATX_DIOALIGN 0x00002000U/* Want/got direct I/O alignment info */ #define STATX_MNT_ID_UNIQUE 0x00004000U/* Want/got extended stx_mount_id */ +#define STATX_VOL 0x00008000U/* Want/got stx_vol */ #define STATX__RESERVED 0x80000000U/* Reserved for future struct statx expansion */
Signature · 1 line
2.43.0
fs/bcachefs/fs.c static int bch2_getattr(struct mnt_idmap *idmap,
Quoted 24 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Kent" == Kent Overstreet <[email protected]> writes:
Add a new statx field for (sub)volume identifiers.
This includes bcachefs support; we'll definitely want btrfs support as well.Link https://lore.kernel.org/linux-fsdevel/2uvhm6gweyl7iyyp2xpfryvcu2g3padagaeqcbiavjyiis6prl@yjm725bizncq/ open hereSigned-off-by Kent Overstreet <[email protected]>Cc Josef Bacik <[email protected]>Cc Miklos Szeredi <[email protected]>Cc Christian Brauner <[email protected]>Cc David Howells <[email protected]>--- fs/bcachefs/fs.c | 3 +++ fs/stat.c | 1 + include/linux/stat.h | 1 + include/uapi/linux/stat.h | 4 +++- 4 files changed, 8 insertions(+), 1 deletion(-)fs/bcachefs/fs.c +0
-0@@ -840,6 +840,9 @@ static int bch2_getattr(struct mnt_idmap *idmap,
stat-> blksize = block_bytes(c);
stat-> blocks = inode->v.i_blocks;
fs/bcachefs/fs.c static int bch2_getattr(struct mnt_idmap *idmap, · line 846
Quoted 4 lines
fs/bcachefs/fs.c +3
-0+ stat->vol = inode->ei_subvol; + stat->result_mask |=STATX_VOL ; +if (request_mask &STATX_BTIME ) {
stat-> result_mask |= STATX_BTIME;
stat-> btime = bch2_time_to_timespec(c, inode->ei_inode.bi_otime);
fs/stat.c cp_statx(const struct kstat *stat, struct statx __user *buffer) · line 661
Quoted 9 lines
fs/stat.c +1
-0@@ -658,6 +658,7 @@ cp_statx(const struct kstat *stat, struct statx __user *buffer) tmp.stx_mnt_id = stat->mnt_id; tmp.stx_dio_mem_align = stat->dio_mem_align; tmp.stx_dio_offset_align = stat->dio_offset_align; + tmp.stx_vol = stat->vol;
So this bugs me that you use subvol and vol sorta interchangeably here. Shouldn't it always be 'subvol'? It's not a seperate volume, it's a snapshot/whatever that is a part of the parent volume, but should be treated seperately.
include/linux/stat.h struct kstat { · line 57
Quoted 12 lines
fs/stat.c +0
-0return copy_to_user (buffer, &tmp,sizeof (tmp)) ? -EFAULT :0 ; }include/linux/stat.h +1
-0@@ -53,6 +53,7 @@ struct kstat {u32 dio_mem_align;u32 dio_offset_align;u64 change_cookie; +u64 vol; };
Again, should this be subvol? And comments added for what it really means?
include/uapi/linux/stat.h struct statx { · line 129
Quoted 10 lines
include/linux/stat.h +0
-0/* These definitions are internal to the kernel for now. Mainly used by nfsd. */ include/uapi/linux/stat.h +1
-0@@ -126,8 +126,9 @@ struct statx {__u64 stx_mnt_id;__u32 stx_dio_mem_align;/* Memory buffer alignment for direct I/O */ __u32 stx_dio_offset_align;/* File offset alignment for direct I/O */ +__u64 stx_vol;/* Subvolume identifier */
Again, then call it 'stx_subvol' if that's what it is!
Quoted 16 lines
include/uapi/linux/stat.h +2
-1/* 0xa0 */ -__u64 __spare3[12 ];/* Spare space for future expansion */ +__u64 __spare3[11 ];/* Spare space for future expansion */ /* 0x100 */ };@@ -155,6 +156,7 @@ struct statx {#define STATX_MNT_ID 0x00001000U/* Got stx_mnt_id */ #define STATX_DIOALIGN 0x00002000U/* Want/got direct I/O alignment info */ #define STATX_MNT_ID_UNIQUE 0x00004000U/* Want/got extended stx_mount_id */ +#define STATX_VOL 0x00008000U/* Want/got stx_vol */ #define STATX__RESERVED 0x80000000U/* Reserved for future struct statx expansion */ Signature · 1 line
2.43.0
Christian Brauner
maintainerQuoted 5 lines · Kent Overstreet
Add a new statx field for (sub)volume identifiers.
This includes bcachefs support; we'll definitely want btrfs support as well.
Quoted 7 lines
Link https://lore.kernel.org/linux-fsdevel/2uvhm6gweyl7iyyp2xpfryvcu2g3padagaeqcbiavjyiis6prl@yjm725bizncq/ open hereSigned-off-by Kent Overstreet <[email protected]>Cc Josef Bacik <[email protected]>Cc Miklos Szeredi <[email protected]>Cc Christian Brauner <[email protected]>Cc David Howells <[email protected]>---
As I've said many times before I'm supportive of this and would pick up a patch like this. There's definitely a lot of userspace that would make use of this that I'm aware of. If the btrfs people could provide an Ack on this to express their support here that would be great.
And it would be lovely if we could expand the commit message a bit and do some renaming/bikeshedding. Imho, STATX_SUBVOLUME_ID is great and then stx_subvolume_id or stx_subvol_id. And then subvolume_id or subvol_id for the field in struct kstat.
Quoted 70 lines
fs/bcachefs/fs.c | 3 +++ fs/stat.c | 1 + include/linux/stat.h | 1 + include/uapi/linux/stat.h | 4 +++- 4 files changed, 8 insertions(+), 1 deletion(-)fs/bcachefs/fs.c +3
-0@@ -840,6 +840,9 @@ static int bch2_getattr(struct mnt_idmap *idmap, stat->blksize =block_bytes (c); stat->blocks = inode->v.i_blocks; + stat->vol = inode->ei_subvol; + stat->result_mask |=STATX_VOL ; +if (request_mask &STATX_BTIME ) { stat->result_mask |=STATX_BTIME ; stat->btime =bch2_time_to_timespec (c, inode->ei_inode.bi_otime);fs/stat.c +1
-0@@ -658,6 +658,7 @@ cp_statx(const struct kstat *stat, struct statx __user *buffer) tmp.stx_mnt_id = stat->mnt_id; tmp.stx_dio_mem_align = stat->dio_mem_align; tmp.stx_dio_offset_align = stat->dio_offset_align; + tmp.stx_vol = stat->vol;return copy_to_user (buffer, &tmp,sizeof (tmp)) ? -EFAULT :0 ; }include/linux/stat.h +1
-0@@ -53,6 +53,7 @@ struct kstat {u32 dio_mem_align;u32 dio_offset_align;u64 change_cookie; +u64 vol; };/* These definitions are internal to the kernel for now. Mainly used by nfsd. */ include/uapi/linux/stat.h +3
-1@@ -126,8 +126,9 @@ struct statx {__u64 stx_mnt_id;__u32 stx_dio_mem_align;/* Memory buffer alignment for direct I/O */ __u32 stx_dio_offset_align;/* File offset alignment for direct I/O */ +__u64 stx_vol;/* Subvolume identifier */ /* 0xa0 */ -__u64 __spare3[12 ];/* Spare space for future expansion */ +__u64 __spare3[11 ];/* Spare space for future expansion */ /* 0x100 */ };@@ -155,6 +156,7 @@ struct statx {#define STATX_MNT_ID 0x00001000U/* Got stx_mnt_id */ #define STATX_DIOALIGN 0x00002000U/* Want/got direct I/O alignment info */ #define STATX_MNT_ID_UNIQUE 0x00004000U/* Want/got extended stx_mount_id */ +#define STATX_VOL 0x00008000U/* Want/got stx_vol */ #define STATX__RESERVED 0x80000000U/* Reserved for future struct statx expansion */ Signature · 1 line
2.43.0
Quoted 19 lines · Christian Brauner
Quoted 5 lines · Kent Overstreet
Add a new statx field for (sub)volume identifiers.
This includes bcachefs support; we'll definitely want btrfs support as well.
Quoted 7 lines
Link https://lore.kernel.org/linux-fsdevel/2uvhm6gweyl7iyyp2xpfryvcu2g3padagaeqcbiavjyiis6prl@yjm725bizncq/ open hereSigned-off-by Kent Overstreet <[email protected]>Cc Josef Bacik <[email protected]>Cc Miklos Szeredi <[email protected]>Cc Christian Brauner <[email protected]>Cc David Howells <[email protected]>---
As I've said many times before I'm supportive of this and would pick up a patch like this. There's definitely a lot of userspace that would make use of this that I'm aware of. If the btrfs people could provide an Ack on this to express their support here that would be great.
Quoted 4 lines
And it would be lovely if we could expand the commit message a bit and do some renaming/bikeshedding. Imho,
STATX_SUBVOLUME_IDis great and thenstx_subvolume_idorstx_subvol_id. And thensubvolume_idorsubvol_idfor the field in struct kstat.
Sorry I had my head down in some NFS problems. This works for me, I agree with the naming suggestions you've made. Kent, when you send a new version I'll review it and then followup with a btrfs patch. Thanks for getting this ball rolling,
Josef
Quoted 19 lines · Christian Brauner
Quoted 5 lines · Kent Overstreet
Add a new statx field for (sub)volume identifiers.
This includes bcachefs support; we'll definitely want btrfs support as well.
Quoted 7 lines
Link https://lore.kernel.org/linux-fsdevel/2uvhm6gweyl7iyyp2xpfryvcu2g3padagaeqcbiavjyiis6prl@yjm725bizncq/ open hereSigned-off-by Kent Overstreet <[email protected]>Cc Josef Bacik <[email protected]>Cc Miklos Szeredi <[email protected]>Cc Christian Brauner <[email protected]>Cc David Howells <[email protected]>---
As I've said many times before I'm supportive of this and would pick up a patch like this. There's definitely a lot of userspace that would make use of this that I'm aware of. If the btrfs people could provide an Ack on this to express their support here that would be great.
Quoted 4 lines
And it would be lovely if we could expand the commit message a bit and do some renaming/bikeshedding. Imho,
STATX_SUBVOLUME_IDis great and thenstx_subvolume_idorstx_subvol_id. And thensubvolume_idorsubvol_idfor the field in struct kstat.
_id is too redundant for me, can we just do STATX_SUBVOL/statx.subvol?
Christian Brauner
maintainerQuoted 20 lines · Kent Overstreet
Quoted 19 lines · Christian Brauner
Quoted 5 lines · Kent Overstreet
Add a new statx field for (sub)volume identifiers.
This includes bcachefs support; we'll definitely want btrfs support as well.
Quoted 7 lines
Link https://lore.kernel.org/linux-fsdevel/2uvhm6gweyl7iyyp2xpfryvcu2g3padagaeqcbiavjyiis6prl@yjm725bizncq/ open hereSigned-off-by Kent Overstreet <[email protected]>Cc Josef Bacik <[email protected]>Cc Miklos Szeredi <[email protected]>Cc Christian Brauner <[email protected]>Cc David Howells <[email protected]>---
As I've said many times before I'm supportive of this and would pick up a patch like this. There's definitely a lot of userspace that would make use of this that I'm aware of. If the btrfs people could provide an Ack on this to express their support here that would be great.
Quoted 6 lines
Quoted 4 lines
And it would be lovely if we could expand the commit message a bit and do some renaming/bikeshedding. Imho,
STATX_SUBVOLUME_IDis great and thenstx_subvolume_idorstx_subvol_id. And thensubvolume_idorsubvol_idfor the field in struct kstat.
_idis too redundant for me, can we just do STATX_SUBVOL/statx.subvol?
Fine by me.