* [PATCH RHEL6 3/4] ext3: Support for vfsv1 quota format [not found] <20091214141123.439793308@dhcp-0-151.brq.redhat.com> @ 2009-12-14 14:11 ` jmarchan 2009-12-14 14:21 ` Jerome Marchand 2009-12-14 14:11 ` [PATCH RHEL6 4/4] ext4: Support for 64-bit " jmarchan 1 sibling, 1 reply; 4+ messages in thread From: jmarchan @ 2009-12-14 14:11 UTC (permalink / raw) To: jmarchan; +Cc: linux-ext4, Jan Kara [-- Attachment #1: vfsv1_quota_format.patch --] [-- Type: text/plain, Size: 2488 bytes --] Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=546311 Description: 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> --- fs/ext3/super.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) Index: rhel6/fs/ext3/super.c =================================================================== --- rhel6.orig/fs/ext3/super.c +++ rhel6/fs/ext3/super.c @@ -525,9 +525,22 @@ static inline void ext3_show_quota_optio #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]); @@ -785,9 +798,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 = { @@ -834,6 +847,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"}, @@ -1119,6 +1133,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) { @@ -1161,6 +1178,7 @@ set_qf_format: case Opt_offgrpjquota: case Opt_jqfmt_vfsold: case Opt_jqfmt_vfsv0: + case Opt_jqfmt_vfsv1: printk(KERN_ERR "EXT3-fs: journaled quota options not " "supported.\n"); ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH RHEL6 3/4] ext3: Support for vfsv1 quota format 2009-12-14 14:11 ` [PATCH RHEL6 3/4] ext3: Support for vfsv1 quota format jmarchan @ 2009-12-14 14:21 ` Jerome Marchand 0 siblings, 0 replies; 4+ messages in thread From: Jerome Marchand @ 2009-12-14 14:21 UTC (permalink / raw) To: linux-ext4; +Cc: Jan Kara Please disregard that email. I just made a "quilt mail" mistake. Sorry for the noise, Jerome On 12/14/2009 03:11 PM, jmarchan@redhat.com wrote: > Bugzilla: > https://bugzilla.redhat.com/show_bug.cgi?id=546311 > > Description: > 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> > --- > fs/ext3/super.c | 30 ++++++++++++++++++++++++------ > 1 file changed, 24 insertions(+), 6 deletions(-) > > Index: rhel6/fs/ext3/super.c > =================================================================== > --- rhel6.orig/fs/ext3/super.c > +++ rhel6/fs/ext3/super.c > @@ -525,9 +525,22 @@ static inline void ext3_show_quota_optio > #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]); > @@ -785,9 +798,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 = { > @@ -834,6 +847,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"}, > @@ -1119,6 +1133,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) { > @@ -1161,6 +1178,7 @@ set_qf_format: > case Opt_offgrpjquota: > case Opt_jqfmt_vfsold: > case Opt_jqfmt_vfsv0: > + case Opt_jqfmt_vfsv1: > printk(KERN_ERR > "EXT3-fs: journaled quota options not " > "supported.\n"); > ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH RHEL6 4/4] ext4: Support for 64-bit quota format [not found] <20091214141123.439793308@dhcp-0-151.brq.redhat.com> 2009-12-14 14:11 ` [PATCH RHEL6 3/4] ext3: Support for vfsv1 quota format jmarchan @ 2009-12-14 14:11 ` jmarchan 2009-12-14 14:22 ` Jerome Marchand 1 sibling, 1 reply; 4+ messages in thread From: jmarchan @ 2009-12-14 14:11 UTC (permalink / raw) To: jmarchan; +Cc: tytso, linux-ext4, Jan Kara [-- Attachment #1: ext4_64b_quota_support.patch --] [-- Type: text/plain, Size: 2716 bytes --] Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=546311 Description: Add support for new 64-bit quota format. It is enough to add proper mount options handling. The rest is done by the generic code. CC: tytso@mit.edu CC: linux-ext4@vger.kernel.org Signed-off-by: Jan Kara <jack@suse.cz> --- fs/ext4/super.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) Index: rhel6/fs/ext4/super.c =================================================================== --- rhel6.orig/fs/ext4/super.c +++ rhel6/fs/ext4/super.c @@ -743,9 +743,22 @@ static inline void ext4_show_quota_optio #if defined(CONFIG_QUOTA) struct ext4_sb_info *sbi = EXT4_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]); @@ -1052,9 +1065,9 @@ enum { Opt_abort, Opt_data_journal, Opt_data_ordered, Opt_data_writeback, Opt_data_err_abort, Opt_data_err_ignore, Opt_mb_history_length, Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, - Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota, - Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err, Opt_resize, - Opt_usrquota, Opt_grpquota, Opt_i_version, + Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota, + Opt_noquota, Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err, + Opt_resize, Opt_usrquota, Opt_grpquota, Opt_i_version, Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_block_validity, Opt_noblock_validity, Opt_inode_readahead_blks, Opt_journal_ioprio @@ -1104,6 +1117,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"}, @@ -1411,6 +1425,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) { @@ -1453,6 +1470,7 @@ set_qf_format: case Opt_offgrpjquota: case Opt_jqfmt_vfsold: case Opt_jqfmt_vfsv0: + case Opt_jqfmt_vfsv1: ext4_msg(sb, KERN_ERR, "journaled quota options not supported"); break; ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH RHEL6 4/4] ext4: Support for 64-bit quota format 2009-12-14 14:11 ` [PATCH RHEL6 4/4] ext4: Support for 64-bit " jmarchan @ 2009-12-14 14:22 ` Jerome Marchand 0 siblings, 0 replies; 4+ messages in thread From: Jerome Marchand @ 2009-12-14 14:22 UTC (permalink / raw) To: tytso; +Cc: linux-ext4, Jan Kara Please disregard that email. I just made a "quilt mail" mistake. Sorry for the noise, Jerome On 12/14/2009 03:11 PM, jmarchan@redhat.com wrote: > Bugzilla: > https://bugzilla.redhat.com/show_bug.cgi?id=546311 > > Description: > Add support for new 64-bit quota format. It is enough to add proper > mount options handling. The rest is done by the generic code. > > CC: tytso@mit.edu > CC: linux-ext4@vger.kernel.org > Signed-off-by: Jan Kara <jack@suse.cz> > --- > fs/ext4/super.c | 30 ++++++++++++++++++++++++------ > 1 file changed, 24 insertions(+), 6 deletions(-) > > Index: rhel6/fs/ext4/super.c > =================================================================== > --- rhel6.orig/fs/ext4/super.c > +++ rhel6/fs/ext4/super.c > @@ -743,9 +743,22 @@ static inline void ext4_show_quota_optio > #if defined(CONFIG_QUOTA) > struct ext4_sb_info *sbi = EXT4_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]); > @@ -1052,9 +1065,9 @@ enum { > Opt_abort, Opt_data_journal, Opt_data_ordered, Opt_data_writeback, > Opt_data_err_abort, Opt_data_err_ignore, Opt_mb_history_length, > Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, > - Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota, > - Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err, Opt_resize, > - Opt_usrquota, Opt_grpquota, Opt_i_version, > + Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota, > + Opt_noquota, Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err, > + Opt_resize, Opt_usrquota, Opt_grpquota, Opt_i_version, > Opt_stripe, Opt_delalloc, Opt_nodelalloc, > Opt_block_validity, Opt_noblock_validity, > Opt_inode_readahead_blks, Opt_journal_ioprio > @@ -1104,6 +1117,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"}, > @@ -1411,6 +1425,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) { > @@ -1453,6 +1470,7 @@ set_qf_format: > case Opt_offgrpjquota: > case Opt_jqfmt_vfsold: > case Opt_jqfmt_vfsv0: > + case Opt_jqfmt_vfsv1: > ext4_msg(sb, KERN_ERR, > "journaled quota options not supported"); > break; > ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-12-14 14:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20091214141123.439793308@dhcp-0-151.brq.redhat.com>
2009-12-14 14:11 ` [PATCH RHEL6 3/4] ext3: Support for vfsv1 quota format jmarchan
2009-12-14 14:21 ` Jerome Marchand
2009-12-14 14:11 ` [PATCH RHEL6 4/4] ext4: Support for 64-bit " jmarchan
2009-12-14 14:22 ` Jerome Marchand
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.