On Wed, Jan 7, 2026 at 7:34 AM John Groves <[email protected]> wrote: > > Virtio_fs now needs to determine if an inode is DAX && not famfs.
nit: it was unclear to me why this patch changed the macro to take in a struct fuse_inode until I looked at patch 14. it might be useful here to add a line about that > > Signed-off-by: John Groves <[email protected]> > --- > fs/fuse/dir.c | 2 +- > fs/fuse/file.c | 13 ++++++++----- > fs/fuse/fuse_i.h | 6 +++++- > fs/fuse/inode.c | 4 ++-- > fs/fuse/iomode.c | 2 +- > 5 files changed, 17 insertions(+), 10 deletions(-) > > diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c > index 4b6b3d2758ff..1400c9d733ba 100644 > --- a/fs/fuse/dir.c > +++ b/fs/fuse/dir.c > @@ -2153,7 +2153,7 @@ int fuse_do_setattr(struct mnt_idmap *idmap, struct > dentry *dentry, > is_truncate = true; > } > > - if (FUSE_IS_DAX(inode) && is_truncate) { > + if (FUSE_IS_VIRTIO_DAX(fi) && is_truncate) { > filemap_invalidate_lock(mapping); > fault_blocked = true; > err = fuse_dax_break_layouts(inode, 0, -1); > diff --git a/fs/fuse/file.c b/fs/fuse/file.c > index 01bc894e9c2b..093569033ed1 100644 > --- a/fs/fuse/file.c > +++ b/fs/fuse/file.c > @@ -252,7 +252,7 @@ static int fuse_open(struct inode *inode, struct file > *file) > int err; > bool is_truncate = (file->f_flags & O_TRUNC) && fc->atomic_o_trunc; > bool is_wb_truncate = is_truncate && fc->writeback_cache; > - bool dax_truncate = is_truncate && FUSE_IS_DAX(inode); > + bool dax_truncate = is_truncate && FUSE_IS_VIRTIO_DAX(fi); > > if (fuse_is_bad(inode)) > return -EIO; > @@ -1812,11 +1812,12 @@ static ssize_t fuse_file_read_iter(struct kiocb > *iocb, struct iov_iter *to) > struct file *file = iocb->ki_filp; > struct fuse_file *ff = file->private_data; > struct inode *inode = file_inode(file); > + struct fuse_inode *fi = get_fuse_inode(inode); > > if (fuse_is_bad(inode)) > return -EIO; > > - if (FUSE_IS_DAX(inode)) > + if (FUSE_IS_VIRTIO_DAX(fi)) > return fuse_dax_read_iter(iocb, to); > > /* FOPEN_DIRECT_IO overrides FOPEN_PASSTHROUGH */ > @@ -1833,11 +1834,12 @@ static ssize_t fuse_file_write_iter(struct kiocb > *iocb, struct iov_iter *from) > struct file *file = iocb->ki_filp; > struct fuse_file *ff = file->private_data; > struct inode *inode = file_inode(file); > + struct fuse_inode *fi = get_fuse_inode(inode); > > if (fuse_is_bad(inode)) > return -EIO; > > - if (FUSE_IS_DAX(inode)) > + if (FUSE_IS_VIRTIO_DAX(fi)) > return fuse_dax_write_iter(iocb, from); > > /* FOPEN_DIRECT_IO overrides FOPEN_PASSTHROUGH */ > @@ -2370,10 +2372,11 @@ static int fuse_file_mmap(struct file *file, struct > vm_area_struct *vma) > struct fuse_file *ff = file->private_data; > struct fuse_conn *fc = ff->fm->fc; > struct inode *inode = file_inode(file); > + struct fuse_inode *fi = get_fuse_inode(inode); > int rc; > > /* DAX mmap is superior to direct_io mmap */ > - if (FUSE_IS_DAX(inode)) > + if (FUSE_IS_VIRTIO_DAX(fi)) > return fuse_dax_mmap(file, vma); > > /* > @@ -2934,7 +2937,7 @@ static long fuse_file_fallocate(struct file *file, int > mode, loff_t offset, > .mode = mode > }; > int err; > - bool block_faults = FUSE_IS_DAX(inode) && > + bool block_faults = FUSE_IS_VIRTIO_DAX(fi) && > (!(mode & FALLOC_FL_KEEP_SIZE) || > (mode & (FALLOC_FL_PUNCH_HOLE | FALLOC_FL_ZERO_RANGE))); > > diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h > index 7f16049387d1..17736c0a6d2f 100644 > --- a/fs/fuse/fuse_i.h > +++ b/fs/fuse/fuse_i.h > @@ -1508,7 +1508,11 @@ void fuse_free_conn(struct fuse_conn *fc); > > /* dax.c */ > > -#define FUSE_IS_DAX(inode) (IS_ENABLED(CONFIG_FUSE_DAX) && IS_DAX(inode)) > +/* This macro is used by virtio_fs, but now it also needs to filter for > + * "not famfs" > + */ Did you mean to add this comment to "patch 14/21: famfs_fuse: Plumb the GET_FMAP message/response" instead? it seems like that's the patch that adds the "&& !fuse_file_famfs(fuse_inode))" part to this. Reviewed-by: Joanne Koong <[email protected]> Thanks, Joanne
