| Message ID | f6155247-32ee-4cfe-b808-9102b17f7cd1@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | fat: convert to the new mount API | expand |
Eric Sandeen <sandeen@redhat.com> writes: > Move the debug variable into fat_mount_options for consistency and > to facilitate conversion to new mount API. > > Signed-off-by: Eric Sandeen <sandeen@redhat.com> Looks good. (maybe, this patchset should go with your patch series with fsparam_uid/gid?) Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Thanks. > --- > fs/fat/fat.h | 3 ++- > fs/fat/inode.c | 9 ++++----- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/fs/fat/fat.h b/fs/fat/fat.h > index 66cf4778cf3b..37ced7bb06d5 100644 > --- a/fs/fat/fat.h > +++ b/fs/fat/fat.h > @@ -51,7 +51,8 @@ struct fat_mount_options { > tz_set:1, /* Filesystem timestamps' offset set */ > rodir:1, /* allow ATTR_RO for directory */ > discard:1, /* Issue discard requests on deletions */ > - dos1xfloppy:1; /* Assume default BPB for DOS 1.x floppies */ > + dos1xfloppy:1, /* Assume default BPB for DOS 1.x floppies */ > + debug:1; /* Not currently used */ > }; > > #define FAT_HASH_BITS 8 > diff --git a/fs/fat/inode.c b/fs/fat/inode.c > index d9e6fbb6f246..2a6537ba0d49 100644 > --- a/fs/fat/inode.c > +++ b/fs/fat/inode.c > @@ -1132,7 +1132,7 @@ static const match_table_t vfat_tokens = { > }; > > static int parse_options(struct super_block *sb, char *options, int is_vfat, > - int silent, int *debug, struct fat_mount_options *opts) > + int silent, struct fat_mount_options *opts) > { > char *p; > substring_t args[MAX_OPT_ARGS]; > @@ -1162,7 +1162,7 @@ static int parse_options(struct super_block *sb, char *options, int is_vfat, > opts->tz_set = 0; > opts->nfs = 0; > opts->errors = FAT_ERRORS_RO; > - *debug = 0; > + opts->debug = 0; > > opts->utf8 = IS_ENABLED(CONFIG_FAT_DEFAULT_UTF8) && is_vfat; > > @@ -1210,7 +1210,7 @@ static int parse_options(struct super_block *sb, char *options, int is_vfat, > opts->showexec = 1; > break; > case Opt_debug: > - *debug = 1; > + opts->debug = 1; > break; > case Opt_immutable: > opts->sys_immutable = 1; > @@ -1614,7 +1614,6 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat, > struct msdos_sb_info *sbi; > u16 logical_sector_size; > u32 total_sectors, total_clusters, fat_clusters, rootdir_sectors; > - int debug; > long error; > char buf[50]; > struct timespec64 ts; > @@ -1643,7 +1642,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat, > ratelimit_state_init(&sbi->ratelimit, DEFAULT_RATELIMIT_INTERVAL, > DEFAULT_RATELIMIT_BURST); > > - error = parse_options(sb, data, isvfat, silent, &debug, &sbi->options); > + error = parse_options(sb, data, isvfat, silent, &sbi->options); > if (error) > goto out_fail;
diff --git a/fs/fat/fat.h b/fs/fat/fat.h index 66cf4778cf3b..37ced7bb06d5 100644 --- a/fs/fat/fat.h +++ b/fs/fat/fat.h @@ -51,7 +51,8 @@ struct fat_mount_options { tz_set:1, /* Filesystem timestamps' offset set */ rodir:1, /* allow ATTR_RO for directory */ discard:1, /* Issue discard requests on deletions */ - dos1xfloppy:1; /* Assume default BPB for DOS 1.x floppies */ + dos1xfloppy:1, /* Assume default BPB for DOS 1.x floppies */ + debug:1; /* Not currently used */ }; #define FAT_HASH_BITS 8 diff --git a/fs/fat/inode.c b/fs/fat/inode.c index d9e6fbb6f246..2a6537ba0d49 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -1132,7 +1132,7 @@ static const match_table_t vfat_tokens = { }; static int parse_options(struct super_block *sb, char *options, int is_vfat, - int silent, int *debug, struct fat_mount_options *opts) + int silent, struct fat_mount_options *opts) { char *p; substring_t args[MAX_OPT_ARGS]; @@ -1162,7 +1162,7 @@ static int parse_options(struct super_block *sb, char *options, int is_vfat, opts->tz_set = 0; opts->nfs = 0; opts->errors = FAT_ERRORS_RO; - *debug = 0; + opts->debug = 0; opts->utf8 = IS_ENABLED(CONFIG_FAT_DEFAULT_UTF8) && is_vfat; @@ -1210,7 +1210,7 @@ static int parse_options(struct super_block *sb, char *options, int is_vfat, opts->showexec = 1; break; case Opt_debug: - *debug = 1; + opts->debug = 1; break; case Opt_immutable: opts->sys_immutable = 1; @@ -1614,7 +1614,6 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat, struct msdos_sb_info *sbi; u16 logical_sector_size; u32 total_sectors, total_clusters, fat_clusters, rootdir_sectors; - int debug; long error; char buf[50]; struct timespec64 ts; @@ -1643,7 +1642,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat, ratelimit_state_init(&sbi->ratelimit, DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RATELIMIT_BURST); - error = parse_options(sb, data, isvfat, silent, &debug, &sbi->options); + error = parse_options(sb, data, isvfat, silent, &sbi->options); if (error) goto out_fail;
Move the debug variable into fat_mount_options for consistency and to facilitate conversion to new mount API. Signed-off-by: Eric Sandeen <sandeen@redhat.com> --- fs/fat/fat.h | 3 ++- fs/fat/inode.c | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-)