quota: Unify VFS and XFS quota interfaces
Subsystems (5)
Jan Kara
reviewerv5 cover quota: Unify VFS and XFS quota interfaces
Hello,
these are outstanding patches in my series unifying VFS and XFS quota
interfaces so that XFS quotactls work for filesystems with VFS quotas and vice versa. This is useful so that userspace doesn't have to care that much about which filesystem it is using at least when using basic quota functionality. In particular we should be able to reuse project quota tests in xfstests for ext4.
The patches are based on top of Linus' tree from few days ago which already contains initial part of the original series. The patch series can also be pulled from 'quota_interface' branch of my tree [1].
I'm sending the series as there are two XFS and one GFS2 patches which still need review before I can add them to my tree for the next merge window.
Honza
[1] git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git
Jan Kara
reviewerPATCH v5 1/8 quota: Make VFS quotas use new interface for getting quota info
Create new internal interface for getting information about quota which contains everything needed for both VFS quotas and XFS quotas. Make VFS use this and hook it up to Q_GETINFO.
--- fs/ext3/super.c | 2 +- fs/ext4/super.c | 2 +- fs/quota/dquot.c | 41 +++++++++++++++++++++++++++-------------- fs/quota/quota.c | 25 +++++++++++++++++++++---- fs/reiserfs/super.c | 2 +- include/linux/quota.h | 33 ++++++++++++++++++++++++++++++++- include/linux/quotaops.h | 2 +- 7 files changed, 84 insertions(+), 23 deletions(-)
fs/ext3/super.c +1 -1
@@ -789,7 +789,7 @@ static const struct quotactl_ops ext3_qctl_operations = { .quota_on = ext3_quota_on, .quota_off = dquot_quota_off, .quota_sync = dquot_quota_sync, - .get_info = dquot_get_dqinfo, + .get_state = dquot_get_state, .set_info = dquot_set_dqinfo, .get_dqblk = dquot_get_dqblk, .set_dqblk = dquot_set_dqblk
fs/ext4/super.c +1 -1
@@ -1076,7 +1076,7 @@ static const struct quotactl_ops ext4_qctl_operations = { .quota_on = ext4_quota_on, .quota_off = ext4_quota_off, .quota_sync = dquot_quota_sync, - .get_info = dquot_get_dqinfo, + .get_state = dquot_get_state, .set_info = dquot_set_dqinfo, .get_dqblk = dquot_get_dqblk, .set_dqblk = dquot_set_dqblk
fs/quota/dquot.c +27 -14
67 lines not on this page · raw message
fs/quota/quota.c +21 -4
@@ -118,13 +118,30 @@ static int quota_getfmt(struct super_block *sb, int type, void __user *addr)static int quota_getinfo (struct super_block *sb,int type,void __user *addr) { -struct if_dqinfo info; +struct qc_state state; +struct qc_type_state *tstate; +struct if_dqinfo uinfo;int ret; -if (!sb->s_qcop->get_info) +/* This checks whether qc_state has enough entries... */ +BUILD_BUG_ON (MAXQUOTAS >XQM_MAXQUOTAS ); +if (!sb->s_qcop->get_state)return -ENOSYS ; - ret = sb->s_qcop->get_info (sb, type, &info); -if (!ret &©_to_user (addr, &info,sizeof (info))) + ret = sb->s_qcop->get_state (sb, &state); +if (ret) +return ret; + tstate = state.s_state + type; +if (!(tstate->flags &QCI_ACCT_ENABLED )) +return -ESRCH ; +memset (&uinfo,0 ,sizeof (uinfo)); + uinfo.dqi_bgrace = tstate->spc_timelimit; + uinfo.dqi_igrace = tstate->ino_timelimit; +if (tstate->flags &QCI_SYSFILE ) + uinfo.dqi_flags |=DQF_SYS_FILE ; +if (tstate->flags &QCI_ROOT_SQUASH ) + uinfo.dqi_flags |=DQF_ROOT_SQUASH ; + uinfo.dqi_valid =IIF_ALL ; +if (!ret &©_to_user (addr, &uinfo,sizeof (uinfo)))return -EFAULT ;return ret; }
fs/reiserfs/super.c +1 -1
@@ -805,7 +805,7 @@ static const struct quotactl_ops reiserfs_qctl_operations = { .quota_on = reiserfs_quota_on, .quota_off = dquot_quota_off, .quota_sync = dquot_quota_sync, - .get_info = dquot_get_dqinfo, + .get_state = dquot_get_state, .set_info = dquot_set_dqinfo, .get_dqblk = dquot_get_dqblk, .set_dqblk = dquot_set_dqblk,
include/linux/quota.h +32 -1
@@ -366,6 +366,37 @@ struct qc_dqblk {#define QC_RT_SPACE (1<<14)#define QC_ACCT_MASK (QC_SPACE | QC_INO_COUNT | QC_RT_SPACE) +#define QCI_SYSFILE (1 << 0)/* Quota file is hidden from userspace */ +#define QCI_ROOT_SQUASH (1 << 1)/* Root squash turned on */ +#define QCI_ACCT_ENABLED (1 << 2)/* Quota accounting enabled */ +#define QCI_LIMITS_ENFORCED (1 << 3)/* Quota limits enforced */ + +/* Structures for communicating via ->get_state */ +struct qc_type_state { +unsigned int flags;/* Flags QCI_* */ +unsigned int spc_timelimit;/* Time after which space softlimit is +* enforced */ +unsigned int ino_timelimit;/* Ditto for inode softlimit */ +unsigned int rt_spc_timelimit;/* Ditto for real-time space */ +unsigned int spc_warnlimit;/* Limit for number of space warnings */ +unsigned int ino_warnlimit;/* Ditto for inodes */ +unsigned int rt_spc_warnlimit;/* Ditto for real-time space */ +unsigned long long ino;/* Inode number of quota file */ +blkcnt_t blocks;/* Number of 512-byte blocks in the file */ +blkcnt_t nextents;/* Number of extents in the file */ +}; + +struct qc_state { +unsigned int s_incoredqs;/* Number of dquots in core */ +/* +* Per quota type information. The array should really have +* max(MAXQUOTAS, XQM_MAXQUOTAS) entries. BUILD_BUG_ON in +* quota_getinfo() makes sure XQM_MAXQUOTAS is large enough. Once VFS +* supports project quotas, this can be changed to MAXQUOTAS +*/ +struct qc_type_state s_state[XQM_MAXQUOTAS ]; +}; +/* Operations handling requests from userspace */ struct quotactl_ops {int (*quota_on)(struct super_block *,int ,int ,struct path *);
@@ -373,10 +404,10 @@ struct quotactl_ops {int (*quota_enable)(struct super_block *,unsigned int );int (*quota_disable)(struct super_block *,unsigned int );int (*quota_sync)(struct super_block *,int ); -int (*get_info)(struct super_block *,int ,struct if_dqinfo *);int (*set_info)(struct super_block *,int ,struct if_dqinfo *);int (*get_dqblk)(struct super_block *,struct kqid ,struct qc_dqblk *);int (*set_dqblk)(struct super_block *,struct kqid ,struct qc_dqblk *); +int (*get_state)(struct super_block *,struct qc_state *);int (*get_xstate)(struct super_block *,struct fs_quota_stat *);int (*get_xstatev)(struct super_block *,struct fs_quota_statv *);int (*rm_xquota)(struct super_block *,unsigned int );
include/linux/quotaops.h +1 -1
@@ -95,7 +95,7 @@ int dquot_quota_on_mount(struct super_block *sb, char *qf_name,int dquot_quota_off (struct super_block *sb,int type);int dquot_writeback_dquots (struct super_block *sb,int type);int dquot_quota_sync (struct super_block *sb,int type); -int dquot_get_dqinfo (struct super_block *sb,int type,struct if_dqinfo *ii); +int dquot_get_state (struct super_block *sb,struct qc_state *state);int dquot_set_dqinfo (struct super_block *sb,int type,struct if_dqinfo *ii);int dquot_get_dqblk (struct super_block *sb,struct kqid id,struct qc_dqblk *di);
Signature · 1 line
2.1.4
Jan Kara
reviewerPATCH v5 2/8 quota: Wire up Q_GETXSTATE and Q_GETXSTATV calls to work with ->get_state
In reply to Jan KaraAdd appropriate conversion functions so that filesystems supporting ->get_state() method can be queried using Q_GETXSTATE and Q_GETXSTATV calls.
--- fs/quota/quota.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 134 insertions(+), 4 deletions(-)
fs/quota/quota.c +134 -4
@@ -269,25 +269,152 @@ static int quota_disable(struct super_block *sb, void __user *addr)return sb->s_qcop->quota_disable (sb, flags); } +static int quota_state_to_flags (struct qc_state *state) +{ +int flags =0 ; + +if (state->s_state[USRQUOTA ].flags &QCI_ACCT_ENABLED ) + flags |=FS_QUOTA_UDQ_ACCT ; +if (state->s_state[USRQUOTA ].flags &QCI_LIMITS_ENFORCED ) + flags |=FS_QUOTA_UDQ_ENFD ; +if (state->s_state[GRPQUOTA ].flags &QCI_ACCT_ENABLED ) + flags |=FS_QUOTA_GDQ_ACCT ; +if (state->s_state[GRPQUOTA ].flags &QCI_LIMITS_ENFORCED ) + flags |=FS_QUOTA_GDQ_ENFD ; +if (state->s_state[PRJQUOTA ].flags &QCI_ACCT_ENABLED ) + flags |=FS_QUOTA_PDQ_ACCT ; +if (state->s_state[PRJQUOTA ].flags &QCI_LIMITS_ENFORCED ) + flags |=FS_QUOTA_PDQ_ENFD ; +return flags; +} + +static int quota_getstate (struct super_block *sb,struct fs_quota_stat *fqs) +{ +int type; +struct qc_state state; +int ret; + + ret = sb->s_qcop->get_state (sb, &state); +if (ret <0 ) +return ret; + +memset (fqs,0 ,sizeof (*fqs)); + fqs->qs_version =FS_QSTAT_VERSION ; + fqs->qs_flags =quota_state_to_flags (&state); +/* No quota enabled? */ +if (!fqs->qs_flags) +return -ENOSYS ; + fqs->qs_incoredqs = state.s_incoredqs; +/* +* GETXSTATE quotactl has space for just one set of time limits so +* report them for the first enabled quota type +*/ +for (type =0 ; type <XQM_MAXQUOTAS ; type++) +if (state.s_state[type].flags &QCI_ACCT_ENABLED ) +break ; +BUG_ON (type ==XQM_MAXQUOTAS ); + fqs->qs_btimelimit = state.s_state[type].spc_timelimit; + fqs->qs_itimelimit = state.s_state[type].ino_timelimit; + fqs->qs_rtbtimelimit = state.s_state[type].rt_spc_timelimit; + fqs->qs_bwarnlimit = state.s_state[type].spc_warnlimit; + fqs->qs_iwarnlimit = state.s_state[type].ino_warnlimit; +if (state.s_state[USRQUOTA ].flags &QCI_ACCT_ENABLED ) { + fqs->qs_uquota.qfs_ino = state.s_state[USRQUOTA ].ino; + fqs->qs_uquota.qfs_nblks = state.s_state[USRQUOTA ].blocks; + fqs->qs_uquota.qfs_nextents = state.s_state[USRQUOTA ].nextents; + } +if (state.s_state[GRPQUOTA ].flags &QCI_ACCT_ENABLED ) { + fqs->qs_gquota.qfs_ino = state.s_state[GRPQUOTA ].ino; + fqs->qs_gquota.qfs_nblks = state.s_state[GRPQUOTA ].blocks; + fqs->qs_gquota.qfs_nextents = state.s_state[GRPQUOTA ].nextents; + } +if (state.s_state[PRJQUOTA ].flags &QCI_ACCT_ENABLED ) { +/* +* Q_XGETQSTAT doesn't have room for both group and project +* quotas. So, allow the project quota values to be copied out +* only if there is no group quota information available. +*/ +if (!(state.s_state[GRPQUOTA ].flags &QCI_ACCT_ENABLED )) { + fqs->qs_gquota.qfs_ino = state.s_state[PRJQUOTA ].ino; + fqs->qs_gquota.qfs_nblks = + state.s_state[PRJQUOTA ].blocks; + fqs->qs_gquota.qfs_nextents = + state.s_state[PRJQUOTA ].nextents; + } + } +return 0 ; +} +static int quota_getxstate (struct super_block *sb,void __user *addr) {struct fs_quota_stat fqs;int ret; -if (!sb->s_qcop->get_xstate) +if (!sb->s_qcop->get_xstate && !sb->s_qcop->get_state)return -ENOSYS ; - ret = sb->s_qcop->get_xstate (sb, &fqs); +if (sb->s_qcop->get_state) + ret =quota_getstate (sb, &fqs); +else + ret = sb->s_qcop->get_xstate (sb, &fqs);if (!ret &©_to_user (addr, &fqs,sizeof (fqs)))return -EFAULT ;return ret; } +static int quota_getstatev (struct super_block *sb,struct fs_quota_statv *fqs) +{ +int type; +struct qc_state state; +int ret; + + ret = sb->s_qcop->get_state (sb, &state); +if (ret <0 ) +return ret; + +memset (fqs,0 ,sizeof (*fqs)); + fqs->qs_version =FS_QSTAT_VERSION ; + fqs->qs_flags =quota_state_to_flags (&state); +/* No quota enabled? */ +if (!fqs->qs_flags) +return -ENOSYS ; + fqs->qs_incoredqs = state.s_incoredqs; +/* +* GETXSTATV quotactl has space for just one set of time limits so +* report them for the first enabled quota type +*/ +for (type =0 ; type <XQM_MAXQUOTAS ; type++) +if (state.s_state[type].flags &QCI_ACCT_ENABLED ) +break ; +BUG_ON (type ==XQM_MAXQUOTAS ); + fqs->qs_btimelimit = state.s_state[type].spc_timelimit; + fqs->qs_itimelimit = state.s_state[type].ino_timelimit; + fqs->qs_rtbtimelimit = state.s_state[type].rt_spc_timelimit; + fqs->qs_bwarnlimit = state.s_state[type].spc_warnlimit; + fqs->qs_iwarnlimit = state.s_state[type].ino_warnlimit; +if (state.s_state[USRQUOTA ].flags &QCI_ACCT_ENABLED ) { + fqs->qs_uquota.qfs_ino = state.s_state[USRQUOTA ].ino; + fqs->qs_uquota.qfs_nblks = state.s_state[USRQUOTA ].blocks; + fqs->qs_uquota.qfs_nextents = state.s_state[USRQUOTA ].nextents; + } +if (state.s_state[GRPQUOTA ].flags &QCI_ACCT_ENABLED ) { + fqs->qs_gquota.qfs_ino = state.s_state[GRPQUOTA ].ino; + fqs->qs_gquota.qfs_nblks = state.s_state[GRPQUOTA ].blocks; + fqs->qs_gquota.qfs_nextents = state.s_state[GRPQUOTA ].nextents; + } +if (state.s_state[PRJQUOTA ].flags &QCI_ACCT_ENABLED ) { + fqs->qs_pquota.qfs_ino = state.s_state[PRJQUOTA ].ino; + fqs->qs_pquota.qfs_nblks = state.s_state[PRJQUOTA ].blocks; + fqs->qs_pquota.qfs_nextents = state.s_state[PRJQUOTA ].nextents; + } +return 0 ; +} +static int quota_getxstatev (struct super_block *sb,void __user *addr) {struct fs_quota_statv fqs;int ret; -if (!sb->s_qcop->get_xstatev) +if (!sb->s_qcop->get_xstatev && !sb->s_qcop->get_state)return -ENOSYS ;memset (&fqs,0 ,sizeof (fqs));
@@ -301,7 +428,10 @@ static int quota_getxstatev(struct super_block *sb, void __user *addr)default :return -EINVAL ; } - ret = sb->s_qcop->get_xstatev (sb, &fqs); +if (sb->s_qcop->get_state) + ret =quota_getstatev (sb, &fqs); +else + ret = sb->s_qcop->get_xstatev (sb, &fqs);if (!ret &©_to_user (addr, &fqs,sizeof (fqs)))return -EFAULT ;return ret;
Signature · 1 line
2.1.4
Jan Kara
reviewerPATCH v5 3/8 xfs: Convert to using ->get_state callback
In reply to Jan KaraConvert xfs to use ->get_state callback instead of ->get_xstate and ->get_xstatev.
--- fs/xfs/xfs_qm.h | 4 -- fs/xfs/xfs_qm_syscalls.c | 176 ----------------------------------------------- fs/xfs/xfs_quotaops.c | 98 +++++++++++++++++++------- 3 files changed, 72 insertions(+), 206 deletions(-)
fs/xfs/xfs_qm.h +0 -4
@@ -168,10 +168,6 @@ extern int xfs_qm_scall_getquota(struct xfs_mount *, xfs_dqid_t, uint, struct qc_dqblk *);extern int xfs_qm_scall_setqlim (struct xfs_mount *,xfs_dqid_t ,uint ,struct qc_dqblk *); -extern int xfs_qm_scall_getqstat (struct xfs_mount *, -struct fs_quota_stat *); -extern int xfs_qm_scall_getqstatv (struct xfs_mount *, -struct fs_quota_statv *);extern int xfs_qm_scall_quotaon (struct xfs_mount *,uint );extern int xfs_qm_scall_quotaoff (struct xfs_mount *,uint );
fs/xfs/xfs_qm_syscalls.c +0 -176
194 lines not on this page · raw message
fs/xfs/xfs_quotaops.c +72 -26
125 lines not on this page · raw message
Signature · 1 line
2.1.4
Re: [Cluster-devel] [PATCH 3/8] xfs: Convert to using ->get_state callback
Quoted 5 lines
fs/xfs/xfs_quotaops.c +5
-0+static void +xfs_qm_fill_state( + struct qc_type_state *tstate, + struct xfs_mount *mp, + struct xfs_inode *ip,
fs/xfs/xfs_quotaops.c line 70
Quoted 10 lines
fs/xfs/xfs_quotaops.c +9
-0+ xfs_ino_t ino) +/* +* Return quota status information, such as enforcements, quota file inode +* numbers etc. +*/ +static int +xfs_fs_get_quota_state ( +struct super_block *sb, +struct qc_state *state)
We usually tab-align the arguments in XFS prototypes.
Otherwise this patch looks good,
Jan Kara
reviewerRe: [Cluster-devel] [PATCH 3/8] xfs: Convert to using ->get_state callback
Quoted 7 lines · Christoph Hellwig
Quoted 6 lines
fs/xfs/xfs_quotaops.c +6
-0+static void +xfs_qm_fill_state ( +struct qc_type_state *tstate, +struct xfs_mount *mp, +struct xfs_inode *ip, +xfs_ino_t ino)
Quoted 10 lines
fs/xfs/xfs_quotaops.c line 70
Quoted 8 lines
fs/xfs/xfs_quotaops.c +8
-0+/* +* Return quota status information, such as enforcements, quota file inode +* numbers etc. +*/ +static int +xfs_fs_get_quota_state ( +struct super_block *sb, +struct qc_state *state)We usually tab-align the arguments in XFS prototypes.
OK, fixed.
Quoted 3 lines
Otherwise this patch looks good,
Reviewed-by Christoph Hellwig <[email protected]>
Thanks.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jan Kara
reviewerPATCH v5 4/8 gfs2: Convert to using ->get_state callback
In reply to Jan KaraConvert gfs2 to use ->get_state callback instead of ->get_xstate.
--- fs/gfs2/quota.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-)
fs/gfs2/quota.c +15 -13
@@ -1467,32 +1467,34 @@ int gfs2_quotad(void *data)return 0 ; } -static int gfs2_quota_get_xstate (struct super_block *sb, -struct fs_quota_stat *fqs) +static int gfs2_quota_get_state (struct super_block *sb,struct qc_state *state) {struct gfs2_sbd *sdp = sb->s_fs_info; -memset (fqs,0 ,sizeof (struct fs_quota_stat )); - fqs->qs_version =FS_QSTAT_VERSION ; +memset (state,0 ,sizeof (*state));switch (sdp->sd_args.ar_quota) {case GFS2_QUOTA_ON : - fqs->qs_flags |= (FS_QUOTA_UDQ_ENFD |FS_QUOTA_GDQ_ENFD ); + state->s_state[USRQUOTA ].flags |=QCI_LIMITS_ENFORCED ; + state->s_state[GRPQUOTA ].flags |=QCI_LIMITS_ENFORCED ;/*FALLTHRU*/ case GFS2_QUOTA_ACCOUNT : - fqs->qs_flags |= (FS_QUOTA_UDQ_ACCT |FS_QUOTA_GDQ_ACCT ); + state->s_state[USRQUOTA ].flags |=QCI_ACCT_ENABLED | +QCI_SYSFILE ; + state->s_state[GRPQUOTA ].flags |=QCI_ACCT_ENABLED | +QCI_SYSFILE ;break ;case GFS2_QUOTA_OFF :break ; } -if (sdp->sd_quota_inode) { - fqs->qs_uquota.qfs_ino =GFS2_I (sdp->sd_quota_inode)->i_no_addr; - fqs->qs_uquota.qfs_nblks = sdp->sd_quota_inode->i_blocks; + state->s_state[USRQUOTA ].ino = +GFS2_I (sdp->sd_quota_inode)->i_no_addr; + state->s_state[USRQUOTA ].blocks = sdp->sd_quota_inode->i_blocks; } - fqs->qs_uquota.qfs_nextents =1 ;/* unsupported */ - fqs->qs_gquota = fqs->qs_uquota;/* its the same inode in both cases */ - fqs->qs_incoredqs =list_lru_count (&gfs2_qd_lru); + state->s_state[USRQUOTA ].nextents =1 ;/* unsupported */ + state->s_state[GRPQUOTA ] = state->s_state[USRQUOTA ]; + state->s_incoredqs =list_lru_count (&gfs2_qd_lru);return 0 ; }
@@ -1637,7 +1639,7 @@ out_put:const struct quotactl_ops gfs2_quotactl_ops = { .quota_sync = gfs2_quota_sync, - .get_xstate = gfs2_quota_get_xstate, + .get_state = gfs2_quota_get_state, .get_dqblk = gfs2_get_dqblk, .set_dqblk = gfs2_set_dqblk, };
Signature · 1 line
2.1.4
Re: [Cluster-devel] [PATCH 4/8] gfs2: Convert to using ->get_state callback
----- Original Message -----
Quoted 69 lines
Convert gfs2 to use ->get_state callback instead of ->get_xstate.
Signed-off-by Jan Kara <[email protected]>--- fs/gfs2/quota.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-)fs/gfs2/quota.c +15
-14@@ -1467,32 +1467,34 @@ int gfs2_quotad(void *data)return 0 ; } -static int gfs2_quota_get_xstate (struct super_block *sb, -struct fs_quota_stat *fqs) +static int gfs2_quota_get_state (struct super_block *sb,struct qc_state *state) {struct gfs2_sbd *sdp = sb->s_fs_info; -memset (fqs,0 ,sizeof (struct fs_quota_stat )); - fqs->qs_version =FS_QSTAT_VERSION ; +memset (state,0 ,sizeof (*state));switch (sdp->sd_args.ar_quota) {case GFS2_QUOTA_ON : - fqs->qs_flags |= (FS_QUOTA_UDQ_ENFD |FS_QUOTA_GDQ_ENFD ); + state->s_state[USRQUOTA ].flags |=QCI_LIMITS_ENFORCED ; + state->s_state[GRPQUOTA ].flags |=QCI_LIMITS_ENFORCED ;/*FALLTHRU*/ case GFS2_QUOTA_ACCOUNT : - fqs->qs_flags |= (FS_QUOTA_UDQ_ACCT |FS_QUOTA_GDQ_ACCT ); + state->s_state[USRQUOTA ].flags |=QCI_ACCT_ENABLED | +QCI_SYSFILE ; + state->s_state[GRPQUOTA ].flags |=QCI_ACCT_ENABLED | +QCI_SYSFILE ;break ;case GFS2_QUOTA_OFF :break ; } -if (sdp->sd_quota_inode) { - fqs->qs_uquota.qfs_ino =GFS2_I (sdp->sd_quota_inode)->i_no_addr; - fqs->qs_uquota.qfs_nblks = sdp->sd_quota_inode->i_blocks; + state->s_state[USRQUOTA ].ino = +GFS2_I (sdp->sd_quota_inode)->i_no_addr; + state->s_state[USRQUOTA ].blocks = sdp->sd_quota_inode->i_blocks; } - fqs->qs_uquota.qfs_nextents =1 ;/* unsupported */ - fqs->qs_gquota = fqs->qs_uquota;/* its the same inode in both cases */ - fqs->qs_incoredqs =list_lru_count (&gfs2_qd_lru); + state->s_state[USRQUOTA ].nextents =1 ;/* unsupported */ + state->s_state[GRPQUOTA ] = state->s_state[USRQUOTA ]; + state->s_incoredqs =list_lru_count (&gfs2_qd_lru);return 0 ; }@@ -1637,7 +1639,7 @@ out_put:const struct quotactl_ops gfs2_quotactl_ops = { .quota_sync = gfs2_quota_sync, - .get_xstate = gfs2_quota_get_xstate, + .get_state = gfs2_quota_get_state, .get_dqblk = gfs2_get_dqblk, .set_dqblk = gfs2_set_dqblk, }; --
Quoted 3 lines
2.1.4
ACK
Looks right.
Bob Peterson
Red Hat File Systems
Jan Kara
reviewerPATCH v5 5/8 quota: Remove ->get_xstate and ->get_xstatev callbacks
In reply to Jan KaraThese callbacks are now unused. Remove them.
--- fs/quota/quota.c | 14 ++++---------- include/linux/quota.h | 2 -- 2 files changed, 4 insertions(+), 12 deletions(-)
fs/quota/quota.c +4 -10
@@ -350,12 +350,9 @@ static int quota_getxstate(struct super_block *sb, void __user *addr)struct fs_quota_stat fqs;int ret; -if (!sb->s_qcop->get_xstate && !sb->s_qcop->get_state) +if (!sb->s_qcop->get_state)return -ENOSYS ; -if (sb->s_qcop->get_state) - ret =quota_getstate (sb, &fqs); -else - ret = sb->s_qcop->get_xstate (sb, &fqs); + ret =quota_getstate (sb, &fqs);if (!ret &©_to_user (addr, &fqs,sizeof (fqs)))return -EFAULT ;return ret;
@@ -414,7 +411,7 @@ static int quota_getxstatev(struct super_block *sb, void __user *addr)struct fs_quota_statv fqs;int ret; -if (!sb->s_qcop->get_xstatev && !sb->s_qcop->get_state) +if (!sb->s_qcop->get_state)return -ENOSYS ;memset (&fqs,0 ,sizeof (fqs));
@@ -428,10 +425,7 @@ static int quota_getxstatev(struct super_block *sb, void __user *addr)default :return -EINVAL ; } -if (sb->s_qcop->get_state) - ret =quota_getstatev (sb, &fqs); -else - ret = sb->s_qcop->get_xstatev (sb, &fqs); + ret =quota_getstatev (sb, &fqs);if (!ret &©_to_user (addr, &fqs,sizeof (fqs)))return -EFAULT ;return ret;
include/linux/quota.h +0 -2
@@ -408,8 +408,6 @@ struct quotactl_ops {int (*get_dqblk)(struct super_block *,struct kqid ,struct qc_dqblk *);int (*set_dqblk)(struct super_block *,struct kqid ,struct qc_dqblk *);int (*get_state)(struct super_block *,struct qc_state *); -int (*get_xstate)(struct super_block *,struct fs_quota_stat *); -int (*get_xstatev)(struct super_block *,struct fs_quota_statv *);int (*rm_xquota)(struct super_block *,unsigned int ); };
Signature · 1 line
2.1.4
Jan Kara
reviewerPATCH v5 6/8 quota: Make ->set_info use structure with neccesary info to VFS and XFS
In reply to Jan KaraChange ->set_info to take new qc_info structure which contains all the necessary information both for XFS and VFS. Convert Q_SETINFO handler to use this structure.
--- fs/quota/dquot.c | 27 ++++++++++++++++----------- fs/quota/quota.c | 21 ++++++++++++++++++++- include/linux/quota.h | 21 +++++++++++++++++++-- include/linux/quotaops.h | 2 +- 4 files changed, 56 insertions(+), 15 deletions(-)
fs/quota/dquot.c +16 -11
@@ -2649,33 +2649,38 @@ int dquot_get_state(struct super_block *sb, struct qc_state *state)EXPORT_SYMBOL (dquot_get_state);/* Generic routine for setting common part of quota file information */ -int dquot_set_dqinfo (struct super_block *sb,int type,struct if_dqinfo *ii) +int dquot_set_dqinfo (struct super_block *sb,int type,struct qc_info *ii) {struct mem_dqinfo *mi;int err =0 ; +if ((ii->i_fieldmask &QC_WARNS_MASK ) || + (ii->i_fieldmask &QC_RT_SPC_TIMER )) +return -EINVAL ;mutex_lock (&sb_dqopt (sb)->dqonoff_mutex);if (!sb_has_quota_active (sb, type)) { err = -ESRCH ; goto out; } mi =sb_dqopt (sb)->info + type; -if (ii->dqi_valid &IIF_FLAGS ) { -if (ii->dqi_flags & ~DQF_SETINFO_MASK || - (ii->dqi_flags &DQF_ROOT_SQUASH && +if (ii->i_fieldmask &QC_FLAGS ) { +if ((ii->i_flags &QCI_ROOT_SQUASH && mi->dqi_format->qf_fmt_id !=QFMT_VFS_OLD )) { err = -EINVAL ; goto out; } }spin_lock (&dq_data_lock); -if (ii->dqi_valid &IIF_BGRACE ) - mi->dqi_bgrace = ii->dqi_bgrace; -if (ii->dqi_valid &IIF_IGRACE ) - mi->dqi_igrace = ii->dqi_igrace; -if (ii->dqi_valid &IIF_FLAGS ) - mi->dqi_flags = (mi->dqi_flags & ~DQF_SETINFO_MASK ) | - (ii->dqi_flags &DQF_SETINFO_MASK ); +if (ii->i_fieldmask &QC_SPC_TIMER ) + mi->dqi_bgrace = ii->i_spc_timelimit; +if (ii->i_fieldmask &QC_INO_TIMER ) + mi->dqi_igrace = ii->i_ino_timelimit; +if (ii->i_fieldmask &QC_FLAGS ) { +if (ii->i_flags &QCI_ROOT_SQUASH ) + mi->dqi_flags |=DQF_ROOT_SQUASH ; +else + mi->dqi_flags &= ~DQF_ROOT_SQUASH ; + }spin_unlock (&dq_data_lock);mark_info_dirty (sb, type);/* Force write to disk */
fs/quota/quota.c +20 -1
@@ -149,12 +149,31 @@ static int quota_getinfo(struct super_block *sb, int type, void __user *addr)static int quota_setinfo (struct super_block *sb,int type,void __user *addr) {struct if_dqinfo info; +struct qc_info qinfo;if (copy_from_user (&info, addr,sizeof (info)))return -EFAULT ;if (!sb->s_qcop->set_info)return -ENOSYS ; -return sb->s_qcop->set_info (sb, type, &info); +if (info.dqi_valid & ~(IIF_FLAGS |IIF_BGRACE |IIF_IGRACE )) +return -EINVAL ; +memset (&qinfo,0 ,sizeof (qinfo)); +if (info.dqi_valid &IIF_FLAGS ) { +if (info.dqi_flags & ~DQF_SETINFO_MASK ) +return -EINVAL ; +if (info.dqi_flags &DQF_ROOT_SQUASH ) + qinfo.i_flags |=QCI_ROOT_SQUASH ; + qinfo.i_fieldmask |=QC_FLAGS ; + } +if (info.dqi_valid &IIF_BGRACE ) { + qinfo.i_spc_timelimit = info.dqi_bgrace; + qinfo.i_fieldmask |=QC_SPC_TIMER ; + } +if (info.dqi_valid &IIF_IGRACE ) { + qinfo.i_ino_timelimit = info.dqi_igrace; + qinfo.i_fieldmask |=QC_INO_TIMER ; + } +return sb->s_qcop->set_info (sb, type, &qinfo); }static inline qsize_t qbtos (qsize_t blocks)
include/linux/quota.h +19 -2
@@ -344,7 +344,10 @@ struct qc_dqblk {int d_rt_spc_warns;/* # warnings issued wrt RT space */ }; -/* Field specifiers for ->set_dqblk() in struct qc_dqblk */ +/* +* Field specifiers for ->set_dqblk() in struct qc_dqblk and also for +* ->set_info() in struct qc_info +*/ #define QC_INO_SOFT (1<<0)#define QC_INO_HARD (1<<1)#define QC_SPC_SOFT (1<<2)
@@ -365,6 +368,7 @@ struct qc_dqblk {#define QC_INO_COUNT (1<<13)#define QC_RT_SPACE (1<<14)#define QC_ACCT_MASK (QC_SPACE | QC_INO_COUNT | QC_RT_SPACE) +#define QC_FLAGS (1<<15)#define QCI_SYSFILE (1 << 0)/* Quota file is hidden from userspace */ #define QCI_ROOT_SQUASH (1 << 1)/* Root squash turned on */
@@ -397,6 +401,19 @@ struct qc_state {struct qc_type_state s_state[XQM_MAXQUOTAS ]; }; +/* Structure for communicating via ->set_info */ +struct qc_info { +int i_fieldmask;/* mask of fields to change in ->set_info() */ +unsigned int i_flags;/* Flags QCI_* */ +unsigned int i_spc_timelimit;/* Time after which space softlimit is +* enforced */ +unsigned int i_ino_timelimit;/* Ditto for inode softlimit */ +unsigned int i_rt_spc_timelimit;/* Ditto for real-time space */ +unsigned int i_spc_warnlimit;/* Limit for number of space warnings */ +unsigned int i_ino_warnlimit;/* Limit for number of inode warnings */ +unsigned int i_rt_spc_warnlimit;/* Ditto for real-time space */ +}; +/* Operations handling requests from userspace */ struct quotactl_ops {int (*quota_on)(struct super_block *,int ,int ,struct path *);
@@ -404,7 +421,7 @@ struct quotactl_ops {int (*quota_enable)(struct super_block *,unsigned int );int (*quota_disable)(struct super_block *,unsigned int );int (*quota_sync)(struct super_block *,int ); -int (*set_info)(struct super_block *,int ,struct if_dqinfo *); +int (*set_info)(struct super_block *,int ,struct qc_info *);int (*get_dqblk)(struct super_block *,struct kqid ,struct qc_dqblk *);int (*set_dqblk)(struct super_block *,struct kqid ,struct qc_dqblk *);int (*get_state)(struct super_block *,struct qc_state *);
include/linux/quotaops.h +1 -1
@@ -96,7 +96,7 @@ int dquot_quota_off(struct super_block *sb, int type);int dquot_writeback_dquots (struct super_block *sb,int type);int dquot_quota_sync (struct super_block *sb,int type);int dquot_get_state (struct super_block *sb,struct qc_state *state); -int dquot_set_dqinfo (struct super_block *sb,int type,struct if_dqinfo *ii); +int dquot_set_dqinfo (struct super_block *sb,int type,struct qc_info *ii);int dquot_get_dqblk (struct super_block *sb,struct kqid id,struct qc_dqblk *di); int dquot_set_dqblk(struct super_block *sb, struct kqid id,
Signature · 1 line
2.1.4
Re: [Cluster-devel] [PATCH 6/8] quota: Make ->set_info use structure with neccesary info to VFS and XFS
Quoted 133 lines · Jan Kara
Change ->set_info to take new
qc_infostructure which contains all the necessary information both for XFS and VFS. ConvertQ_SETINFOhandler to use this structure.Signed-off-by Jan Kara <[email protected]>--- fs/quota/dquot.c | 27 ++++++++++++++++----------- fs/quota/quota.c | 21 ++++++++++++++++++++- include/linux/quota.h | 21 +++++++++++++++++++-- include/linux/quotaops.h | 2 +- 4 files changed, 56 insertions(+), 15 deletions(-)fs/quota/dquot.c +16
-11@@ -2649,33 +2649,38 @@ int dquot_get_state(struct super_block *sb, struct qc_state *state)EXPORT_SYMBOL (dquot_get_state);/* Generic routine for setting common part of quota file information */ -int dquot_set_dqinfo (struct super_block *sb,int type,struct if_dqinfo *ii) +int dquot_set_dqinfo (struct super_block *sb,int type,struct qc_info *ii) {struct mem_dqinfo *mi;int err =0 ; +if ((ii->i_fieldmask &QC_WARNS_MASK ) || + (ii->i_fieldmask &QC_RT_SPC_TIMER )) +return -EINVAL ;mutex_lock (&sb_dqopt (sb)->dqonoff_mutex);if (!sb_has_quota_active (sb, type)) { err = -ESRCH ; goto out; } mi =sb_dqopt (sb)->info + type; -if (ii->dqi_valid &IIF_FLAGS ) { -if (ii->dqi_flags & ~DQF_SETINFO_MASK || - (ii->dqi_flags &DQF_ROOT_SQUASH && +if (ii->i_fieldmask &QC_FLAGS ) { +if ((ii->i_flags &QCI_ROOT_SQUASH && mi->dqi_format->qf_fmt_id !=QFMT_VFS_OLD )) { err = -EINVAL ; goto out; } }spin_lock (&dq_data_lock); -if (ii->dqi_valid &IIF_BGRACE ) - mi->dqi_bgrace = ii->dqi_bgrace; -if (ii->dqi_valid &IIF_IGRACE ) - mi->dqi_igrace = ii->dqi_igrace; -if (ii->dqi_valid &IIF_FLAGS ) - mi->dqi_flags = (mi->dqi_flags & ~DQF_SETINFO_MASK ) | - (ii->dqi_flags &DQF_SETINFO_MASK ); +if (ii->i_fieldmask &QC_SPC_TIMER ) + mi->dqi_bgrace = ii->i_spc_timelimit; +if (ii->i_fieldmask &QC_INO_TIMER ) + mi->dqi_igrace = ii->i_ino_timelimit; +if (ii->i_fieldmask &QC_FLAGS ) { +if (ii->i_flags &QCI_ROOT_SQUASH ) + mi->dqi_flags |=DQF_ROOT_SQUASH ; +else + mi->dqi_flags &= ~DQF_ROOT_SQUASH ; + }spin_unlock (&dq_data_lock);mark_info_dirty (sb, type);/* Force write to disk */ fs/quota/quota.c +20
-1@@ -149,12 +149,31 @@ static int quota_getinfo(struct super_block *sb, int type, void __user *addr)static int quota_setinfo (struct super_block *sb,int type,void __user *addr) {struct if_dqinfo info; +struct qc_info qinfo;if (copy_from_user (&info, addr,sizeof (info)))return -EFAULT ;if (!sb->s_qcop->set_info)return -ENOSYS ; -return sb->s_qcop->set_info (sb, type, &info); +if (info.dqi_valid & ~(IIF_FLAGS |IIF_BGRACE |IIF_IGRACE )) +return -EINVAL ; +memset (&qinfo,0 ,sizeof (qinfo)); +if (info.dqi_valid &IIF_FLAGS ) { +if (info.dqi_flags & ~DQF_SETINFO_MASK ) +return -EINVAL ; +if (info.dqi_flags &DQF_ROOT_SQUASH ) + qinfo.i_flags |=QCI_ROOT_SQUASH ; + qinfo.i_fieldmask |=QC_FLAGS ; + } +if (info.dqi_valid &IIF_BGRACE ) { + qinfo.i_spc_timelimit = info.dqi_bgrace; + qinfo.i_fieldmask |=QC_SPC_TIMER ; + } +if (info.dqi_valid &IIF_IGRACE ) { + qinfo.i_ino_timelimit = info.dqi_igrace; + qinfo.i_fieldmask |=QC_INO_TIMER ; + } +return sb->s_qcop->set_info (sb, type, &qinfo); }static inline qsize_t qbtos (qsize_t blocks)include/linux/quota.h +7
-1@@ -344,7 +344,10 @@ struct qc_dqblk {int d_rt_spc_warns;/* # warnings issued wrt RT space */ }; -/* Field specifiers for ->set_dqblk() in struct qc_dqblk */ +/* +* Field specifiers for ->set_dqblk() in struct qc_dqblk and also for +* ->set_info() in struct qc_info +*/ #define QC_INO_SOFT (1<<0)#define QC_INO_HARD (1<<1)#define QC_SPC_SOFT (1<<2)@@ -365,6 +368,7 @@ struct qc_dqblk {#define QC_INO_COUNT (1<<13)#define QC_RT_SPACE (1<<14)#define QC_ACCT_MASK (QC_SPACE | QC_INO_COUNT | QC_RT_SPACE) +#define QC_FLAGS (1<<15)#define QCI_SYSFILE (1 << 0)/* Quota file is hidden from userspace */ #define QCI_ROOT_SQUASH (1 << 1)/* Root squash turned on */ @@ -397,6 +401,19 @@ struct qc_state {struct qc_type_state s_state[XQM_MAXQUOTAS ]; }; +/* Structure for communicating via ->set_info */ +struct qc_info {
include/linux/quota.h struct qc_state { · line 415
Quoted 10 lines
include/linux/quota.h +10
-0+int i_fieldmask;/* mask of fields to change in ->set_info() */ +unsigned int i_flags;/* Flags QCI_* */ +unsigned int i_spc_timelimit;/* Time after which space softlimit is +* enforced */ +unsigned int i_ino_timelimit;/* Ditto for inode softlimit */ +unsigned int i_rt_spc_timelimit;/* Ditto for real-time space */ +unsigned int i_spc_warnlimit;/* Limit for number of space warnings */ +unsigned int i_ino_warnlimit;/* Limit for number of inode warnings */ +unsigned int i_rt_spc_warnlimit;/* Ditto for real-time space */ +};
What does the i_ prefix stand for?
Otherwise this looks fine to me.
Jan Kara
reviewerRe: [Cluster-devel] [PATCH 6/8] quota: Make ->set_info use structure with neccesary info to VFS and XFS
Quoted 4 lines · Christoph Hellwig
Quoted 3 lines · Jan Kara
Change ->set_info to take new
qc_infostructure which contains all the necessary information both for XFS and VFS. ConvertQ_SETINFOhandler to use this structure.
...
Quoted 6 lines
Quoted 6 lines
include/linux/quota.h +6
-0+/* Structure for communicating via ->set_info */ +struct qc_info { +int i_fieldmask;/* mask of fields to change in ->set_info() */ +unsigned int i_flags;/* Flags QCI_* */ +unsigned int i_spc_timelimit;/* Time after which space softlimit is +* enforced */
Quoted 8 lines
include/linux/quota.h struct qc_state { · line 415
Quoted 6 lines
include/linux/quota.h +6
-0+unsigned int i_ino_timelimit;/* Ditto for inode softlimit */ +unsigned int i_rt_spc_timelimit;/* Ditto for real-time space */ +unsigned int i_spc_warnlimit;/* Limit for number of space warnings */ +unsigned int i_ino_warnlimit;/* Limit for number of inode warnings */ +unsigned int i_rt_spc_warnlimit;/* Ditto for real-time space */ +};What does the i_ prefix stand for?
It stands for info. I can change it e.g. to qci_ for quotactl info if you
think that would be better...
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jan Kara
reviewerPATCH v5 7/8 xfs: Add support for Q_SETINFO
In reply to Jan KaraAdd support to XFS so that time limits can be set through Q_SETINFO quotactl.
--- fs/xfs/xfs_quotaops.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
fs/xfs/xfs_quotaops.c +37 -0
@@ -111,6 +111,42 @@ xfs_quota_type(int type) } } +#define XFS_QC_SETINFO_MASK (QC_TIMER_MASK | QC_WARNS_MASK) + +/* +* Adjust quota timers & warnings +*/ +static int +xfs_fs_set_info ( +struct super_block *sb, +int type, +struct qc_info *info) +{ +struct xfs_mount *mp =XFS_M (sb); +struct qc_dqblk newlim; + +if (sb->s_flags &MS_RDONLY ) +return -EROFS ; +if (!XFS_IS_QUOTA_RUNNING (mp)) +return -ENOSYS ; +if (!XFS_IS_QUOTA_ON (mp)) +return -ESRCH ; +if (info->i_fieldmask & ~XFS_QC_SETINFO_MASK ) +return -EINVAL ; +if ((info->i_fieldmask &XFS_QC_SETINFO_MASK ) ==0 ) +return 0 ; + + newlim.d_fieldmask = info->i_fieldmask; + newlim.d_spc_timer = info->i_spc_timelimit; + newlim.d_ino_timer = info->i_ino_timelimit; + newlim.d_rt_spc_timer = info->i_rt_spc_timelimit; + newlim.d_ino_warns = info->i_ino_warnlimit; + newlim.d_spc_warns = info->i_spc_warnlimit; + newlim.d_rt_spc_warns = info->i_rt_spc_warnlimit; + +return xfs_qm_scall_setqlim (mp,0 ,xfs_quota_type (type), &newlim); +} +static unsigned int xfs_quota_flags (unsigned int uflags) {
@@ -226,6 +262,7 @@ xfs_fs_set_dqblk(const struct quotactl_ops xfs_quotactl_operations = { .get_state = xfs_fs_get_quota_state, + .set_info = xfs_fs_set_info, .quota_enable = xfs_quota_enable, .quota_disable = xfs_quota_disable, .rm_xquota = xfs_fs_rm_xquota,
Signature · 1 line
2.1.4
Re: [Cluster-devel] [PATCH 7/8] xfs: Add support for Q_SETINFO
Looks fine except for the cosmetical argument alignment style issue.
Jan Kara
reviewerRe: [Cluster-devel] [PATCH 7/8] xfs: Add support for Q_SETINFO
Quoted 1 line · Christoph Hellwig
Looks fine except for the cosmetical argument alignment style issue.
OK, fixed.
Quoted 1 line
Reviewed-by Christoph Hellwig <[email protected]>
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Jan Kara
reviewerPATCH v5 8/8 quota: Hook up Q_XSETQLIM for id 0 to ->set_info
In reply to Jan KaraSetting timers or warning counts for id 0 via Q_XSETQLIM is used to actually set time limits and warning limits for all users. Hook up ->set_info to this so that VFS quota time limits get set the same way as XFS ones.
When doing this Q_XSETQLIM for XFS is effectively split into two independent transactions - one for setting timers and warning limits and one for setting space and inode limits. Although this is inefficient, it is rare enough that it does not matter.
--- fs/quota/quota.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)
fs/quota/quota.c +39 -0
@@ -517,6 +517,30 @@ static void copy_from_xfs_dqblk(struct qc_dqblk *dst, struct fs_disk_quota *src) dst->d_fieldmask |=QC_RT_SPACE ; } +static void copy_qcinfo_from_xfs_dqblk (struct qc_info *dst, +struct fs_disk_quota *src) +{ +memset (dst,0 ,sizeof (*dst)); + dst->i_spc_timelimit = src->d_btimer; + dst->i_ino_timelimit = src->d_itimer; + dst->i_rt_spc_timelimit = src->d_rtbtimer; + dst->i_ino_warnlimit = src->d_iwarns; + dst->i_spc_warnlimit = src->d_bwarns; + dst->i_rt_spc_warnlimit = src->d_rtbwarns; +if (src->d_fieldmask &FS_DQ_BWARNS ) + dst->i_fieldmask |=QC_SPC_WARNS ; +if (src->d_fieldmask &FS_DQ_IWARNS ) + dst->i_fieldmask |=QC_INO_WARNS ; +if (src->d_fieldmask &FS_DQ_RTBWARNS ) + dst->i_fieldmask |=QC_RT_SPC_WARNS ; +if (src->d_fieldmask &FS_DQ_BTIMER ) + dst->i_fieldmask |=QC_SPC_TIMER ; +if (src->d_fieldmask &FS_DQ_ITIMER ) + dst->i_fieldmask |=QC_INO_TIMER ; +if (src->d_fieldmask &FS_DQ_RTBTIMER ) + dst->i_fieldmask |=QC_RT_SPC_TIMER ; +} +static int quota_setxquota (struct super_block *sb,int type,qid_t id,void __user *addr) {
@@ -531,6 +555,21 @@ static int quota_setxquota(struct super_block *sb, int type, qid_t id, qid =make_kqid (current_user_ns (), type, id);if (!qid_valid (qid))return -EINVAL ; +/* Are we actually setting timer / warning limits for all users? */ +if (from_kqid (&init_user_ns, qid) ==0 && + fdq.d_fieldmask & (FS_DQ_WARNS_MASK |FS_DQ_TIMER_MASK )) { +struct qc_info qinfo; +int ret; + +if (!sb->s_qcop->set_info) +return -EINVAL ; +copy_qcinfo_from_xfs_dqblk (&qinfo, &fdq); + ret = sb->s_qcop->set_info (sb, type, &qinfo); +if (ret) +return ret; +/* These are already done */ + fdq.d_fieldmask &= ~(FS_DQ_WARNS_MASK |FS_DQ_TIMER_MASK ); + }copy_from_xfs_dqblk (&qdq, &fdq);return sb->s_qcop->set_dqblk (sb, qid, &qdq); }
Signature · 1 line
2.1.4
Re: [Cluster-devel] [PATCH 8/8] quota: Hook up Q_XSETQLIM for id 0 to ->set_info
Looks good,