All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jan Kara <jack@suse.cz>
To: linux-fsdevel@vger.kernel.org
Cc: xfs@oss.sgi.com, cluster-devel@redhat.com,
	ocfs2-devel@oss.oracle.com, Jan Kara <jack@suse.cz>
Subject: [PATCH 12/16] gfs2: Convert to using ->get_state callback
Date: Mon, 26 Jan 2015 15:34:29 +0100	[thread overview]
Message-ID: <1422282873-3381-13-git-send-email-jack@suse.cz> (raw)
In-Reply-To: <1422282873-3381-1-git-send-email-jack@suse.cz>

Convert gfs2 to use ->get_state callback instead of ->get_xstate.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 fs/gfs2/quota.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 3e193cb36996..c76e031ccbb4 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -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,
 };
-- 
2.1.2


WARNING: multiple messages have this Message-ID
From: Jan Kara <jack@suse.cz>
To: linux-fsdevel@vger.kernel.org
Cc: cluster-devel@redhat.com, Jan Kara <jack@suse.cz>,
	ocfs2-devel@oss.oracle.com, xfs@oss.sgi.com
Subject: [PATCH 12/16] gfs2: Convert to using ->get_state callback
Date: Mon, 26 Jan 2015 15:34:29 +0100	[thread overview]
Message-ID: <1422282873-3381-13-git-send-email-jack@suse.cz> (raw)
In-Reply-To: <1422282873-3381-1-git-send-email-jack@suse.cz>

Convert gfs2 to use ->get_state callback instead of ->get_xstate.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 fs/gfs2/quota.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 3e193cb36996..c76e031ccbb4 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -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,
 };
-- 
2.1.2

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

WARNING: multiple messages have this Message-ID
From: Jan Kara <jack@suse.cz>
To: linux-fsdevel@vger.kernel.org
Cc: xfs@oss.sgi.com, cluster-devel@redhat.com,
	ocfs2-devel@oss.oracle.com, Jan Kara <jack@suse.cz>
Subject: [Ocfs2-devel] [PATCH 12/16] gfs2: Convert to using ->get_state callback
Date: Mon, 26 Jan 2015 15:34:29 +0100	[thread overview]
Message-ID: <1422282873-3381-13-git-send-email-jack@suse.cz> (raw)
In-Reply-To: <1422282873-3381-1-git-send-email-jack@suse.cz>

Convert gfs2 to use ->get_state callback instead of ->get_xstate.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 fs/gfs2/quota.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 3e193cb36996..c76e031ccbb4 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -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,
 };
-- 
2.1.2

  parent reply	other threads:[~2015-01-26 14:34 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-26 14:34 [PATCH 00/16 v4] quota: Unify VFS and XFS quota interfaces Jan Kara
2015-01-26 14:34 ` [Ocfs2-devel] " Jan Kara
2015-01-26 14:34 ` Jan Kara
2015-01-26 14:34 ` [PATCH 01/16] quota: Switch ->get_dqblk() and ->set_dqblk() to use bytes as space units Jan Kara
2015-01-26 14:34   ` [Ocfs2-devel] " Jan Kara
2015-01-26 14:34   ` Jan Kara
2015-01-26 14:34 ` [PATCH 02/16] quota: Split ->set_xstate callback into two Jan Kara
2015-01-26 14:34   ` [Ocfs2-devel] " Jan Kara
2015-01-26 14:34   ` Jan Kara
2015-01-26 14:34 ` [PATCH 03/16] quota: Wire up ->quota_{enable,disable} callbacks into Q_QUOTA{ON,OFF} Jan Kara
2015-01-26 14:34   ` [Ocfs2-devel] [PATCH 03/16] quota: Wire up ->quota_{enable, disable} callbacks into Q_QUOTA{ON, OFF} Jan Kara
2015-01-26 14:34   ` Jan Kara
2015-01-26 14:34 ` [PATCH 04/16] quota: Add ->quota_{enable,disable} callbacks for VFS quotas Jan Kara
2015-01-26 14:34   ` [Ocfs2-devel] [PATCH 04/16] quota: Add ->quota_{enable, disable} " Jan Kara
2015-01-26 14:34   ` Jan Kara
2015-01-26 14:34 ` [PATCH 05/16] ext4: Use generic helpers for quotaon and quotaoff Jan Kara
2015-01-26 14:34   ` [Ocfs2-devel] " Jan Kara
2015-01-26 14:34   ` Jan Kara
2015-01-26 14:34 ` [PATCH 06/16] ocfs2: " Jan Kara
2015-01-26 14:34   ` [Ocfs2-devel] " Jan Kara
2015-01-26 14:34   ` Jan Kara
2015-01-26 14:34 ` [PATCH 07/16] quota: Remove quota_on_meta callback Jan Kara
2015-01-26 14:34   ` [Ocfs2-devel] " Jan Kara
2015-01-26 14:34   ` Jan Kara
2015-01-26 14:34 ` [PATCH 08/16] quota: Store maximum space limit in bytes Jan Kara
2015-01-26 14:34   ` [Ocfs2-devel] " Jan Kara
2015-01-26 14:34   ` Jan Kara
2015-01-26 14:34 ` [PATCH 09/16] quota: Make VFS quotas use new interface for getting quota info Jan Kara
2015-01-26 14:34   ` [Ocfs2-devel] " Jan Kara
2015-01-26 14:34   ` Jan Kara
2015-01-26 14:34 ` [PATCH 10/16] quota: Wire up Q_GETXSTATE and Q_GETXSTATV calls to work with ->get_state Jan Kara
2015-01-26 14:34   ` [Ocfs2-devel] " Jan Kara
2015-01-26 14:34   ` Jan Kara
2015-01-26 14:34 ` [PATCH 11/16] xfs: Convert to using ->get_state callback Jan Kara
2015-01-26 14:34   ` [Ocfs2-devel] " Jan Kara
2015-01-26 14:34   ` Jan Kara
2015-01-26 14:34 ` Jan Kara [this message]
2015-01-26 14:34   ` [Ocfs2-devel] [PATCH 12/16] gfs2: " Jan Kara
2015-01-26 14:34   ` Jan Kara
2015-01-26 14:34 ` [PATCH 13/16] quota: Remove ->get_xstate and ->get_xstatev callbacks Jan Kara
2015-01-26 14:34   ` [Ocfs2-devel] " Jan Kara
2015-01-26 14:34   ` Jan Kara
2015-01-26 14:34 ` [PATCH 14/16] quota: Make ->set_info use structure with neccesary info to VFS and XFS Jan Kara
2015-01-26 14:34   ` [Ocfs2-devel] " Jan Kara
2015-01-26 14:34   ` Jan Kara
2015-01-26 14:34 ` [PATCH 15/16] xfs: Add support for Q_SETINFO Jan Kara
2015-01-26 14:34   ` [Ocfs2-devel] " Jan Kara
2015-01-26 14:34   ` Jan Kara
2015-01-26 14:34 ` [PATCH 16/16] quota: Hook up Q_XSETQLIM for id 0 to ->set_info Jan Kara
2015-01-26 14:34   ` [Ocfs2-devel] " Jan Kara
2015-01-26 14:34   ` Jan Kara

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1422282873-3381-13-git-send-email-jack@suse.cz \
    --to=jack@suse.cz \
    --cc=cluster-devel@redhat.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=ocfs2-devel@oss.oracle.com \
    --cc=xfs@oss.sgi.com \
    --subject='Re: [PATCH 12/16] gfs2: Convert to using ->get_state callback' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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.