ext3: Support for vfsv1 quota format
We just have to add proper mount options handling. The rest is handled by the generic quota code. CC: linux-ext4@vger.kernel.org Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Родитель
498c60153e
Коммит
1aeec43432
|
@ -539,9 +539,22 @@ static inline void ext3_show_quota_options(struct seq_file *seq, struct super_bl
|
|||
#if defined(CONFIG_QUOTA)
|
||||
struct ext3_sb_info *sbi = EXT3_SB(sb);
|
||||
|
||||
if (sbi->s_jquota_fmt)
|
||||
seq_printf(seq, ",jqfmt=%s",
|
||||
(sbi->s_jquota_fmt == QFMT_VFS_OLD) ? "vfsold": "vfsv0");
|
||||
if (sbi->s_jquota_fmt) {
|
||||
char *fmtname = "";
|
||||
|
||||
switch (sbi->s_jquota_fmt) {
|
||||
case QFMT_VFS_OLD:
|
||||
fmtname = "vfsold";
|
||||
break;
|
||||
case QFMT_VFS_V0:
|
||||
fmtname = "vfsv0";
|
||||
break;
|
||||
case QFMT_VFS_V1:
|
||||
fmtname = "vfsv1";
|
||||
break;
|
||||
}
|
||||
seq_printf(seq, ",jqfmt=%s", fmtname);
|
||||
}
|
||||
|
||||
if (sbi->s_qf_names[USRQUOTA])
|
||||
seq_printf(seq, ",usrjquota=%s", sbi->s_qf_names[USRQUOTA]);
|
||||
|
@ -802,9 +815,9 @@ enum {
|
|||
Opt_abort, Opt_data_journal, Opt_data_ordered, Opt_data_writeback,
|
||||
Opt_data_err_abort, Opt_data_err_ignore,
|
||||
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
|
||||
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
|
||||
Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota,
|
||||
Opt_grpquota
|
||||
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
|
||||
Opt_noquota, Opt_ignore, Opt_barrier, Opt_err, Opt_resize,
|
||||
Opt_usrquota, Opt_grpquota
|
||||
};
|
||||
|
||||
static const match_table_t tokens = {
|
||||
|
@ -852,6 +865,7 @@ static const match_table_t tokens = {
|
|||
{Opt_grpjquota, "grpjquota=%s"},
|
||||
{Opt_jqfmt_vfsold, "jqfmt=vfsold"},
|
||||
{Opt_jqfmt_vfsv0, "jqfmt=vfsv0"},
|
||||
{Opt_jqfmt_vfsv1, "jqfmt=vfsv1"},
|
||||
{Opt_grpquota, "grpquota"},
|
||||
{Opt_noquota, "noquota"},
|
||||
{Opt_quota, "quota"},
|
||||
|
@ -1138,6 +1152,9 @@ clear_qf_name:
|
|||
goto set_qf_format;
|
||||
case Opt_jqfmt_vfsv0:
|
||||
qfmt = QFMT_VFS_V0;
|
||||
goto set_qf_format;
|
||||
case Opt_jqfmt_vfsv1:
|
||||
qfmt = QFMT_VFS_V1;
|
||||
set_qf_format:
|
||||
if (sb_any_quota_loaded(sb) &&
|
||||
sbi->s_jquota_fmt != qfmt) {
|
||||
|
@ -1180,6 +1197,7 @@ set_qf_format:
|
|||
case Opt_offgrpjquota:
|
||||
case Opt_jqfmt_vfsold:
|
||||
case Opt_jqfmt_vfsv0:
|
||||
case Opt_jqfmt_vfsv1:
|
||||
ext3_msg(sb, KERN_ERR,
|
||||
"error: journaled quota options not "
|
||||
"supported.");
|
||||
|
|
Загрузка…
Ссылка в новой задаче