diff options
| author | Jeffle Xu <jefflexu@linux.alibaba.com> | 2021-11-25 15:05:25 +0800 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@redhat.com> | 2021-12-14 11:09:36 +0100 |
| commit | 780b1b959f9bd959e1aca450e9fee0e2c00b31ad (patch) | |
| tree | 8e1704713c3fdbd5328a5c2b28e178e06e98bcbf /fs/fuse/inode.c | |
| parent | cecd491641c23f3c63958a62efb74cdaf3c93d7b (diff) | |
| download | linux-780b1b959f9bd959e1aca450e9fee0e2c00b31ad.tar.gz linux-780b1b959f9bd959e1aca450e9fee0e2c00b31ad.tar.bz2 linux-780b1b959f9bd959e1aca450e9fee0e2c00b31ad.zip | |
fuse: make DAX mount option a tri-state
We add 'always', 'never', and 'inode' (default). '-o dax' continues to
operate the same which is equivalent to 'always'.
The following behavior is consistent with that on ext4/xfs:
- The default behavior (when neither '-o dax' nor
'-o dax=always|never|inode' option is specified) is equal to 'inode'
mode, while 'dax=inode' won't be printed among the mount option list.
- The 'inode' mode is only advisory. It will silently fallback to 'never'
mode if fuse server doesn't support that.
Also noted that by the time of this commit, 'inode' mode is actually equal
to 'always' mode, before the per inode DAX flag is introduced in the
following patch.
Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
Reviewed-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/fuse/inode.c')
| -rw-r--r-- | fs/fuse/inode.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 63ab45427de5..d83589ef11c0 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -767,8 +767,12 @@ static int fuse_show_options(struct seq_file *m, struct dentry *root) seq_printf(m, ",blksize=%lu", sb->s_blocksize); } #ifdef CONFIG_FUSE_DAX - if (fc->dax) - seq_puts(m, ",dax"); + if (fc->dax_mode == FUSE_DAX_ALWAYS) + seq_puts(m, ",dax=always"); + else if (fc->dax_mode == FUSE_DAX_NEVER) + seq_puts(m, ",dax=never"); + else if (fc->dax_mode == FUSE_DAX_INODE_USER) + seq_puts(m, ",dax=inode"); #endif return 0; @@ -1523,7 +1527,7 @@ int fuse_fill_super_common(struct super_block *sb, struct fuse_fs_context *ctx) sb->s_subtype = ctx->subtype; ctx->subtype = NULL; if (IS_ENABLED(CONFIG_FUSE_DAX)) { - err = fuse_dax_conn_alloc(fc, ctx->dax_dev); + err = fuse_dax_conn_alloc(fc, ctx->dax_mode, ctx->dax_dev); if (err) goto err; } |