cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
From: Jan Kara <jack@suse.cz>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH 02/25] xfs: Remove unused variable in xfs_qm_scall_quotaon()
Date: Thu, 18 Dec 2014 16:37:16 +0100	[thread overview]
Message-ID: <1418917059-23870-3-git-send-email-jack@suse.cz> (raw)
In-Reply-To: <1418917059-23870-1-git-send-email-jack@suse.cz>

sbflags variable in xfs_qm_scall_quotaon() was practically unused (we
only set it to constant at one place and used it elsewhere). Remove it.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 fs/xfs/xfs_qm_syscalls.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index 74fca68e43b6..28f55fa13831 100644
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -314,7 +314,6 @@ xfs_qm_scall_quotaon(
 {
 	int		error;
 	uint		qf;
-	__int64_t	sbflags;
 
 	flags &= (XFS_ALL_QUOTA_ACCT | XFS_ALL_QUOTA_ENFD);
 	/*
@@ -322,8 +321,6 @@ xfs_qm_scall_quotaon(
 	 */
 	flags &= ~(XFS_ALL_QUOTA_ACCT);
 
-	sbflags = 0;
-
 	if (flags == 0) {
 		xfs_debug(mp, "%s: zero flags, m_qflags=%x",
 			__func__, mp->m_qflags);
@@ -370,11 +367,10 @@ xfs_qm_scall_quotaon(
 	/*
 	 * There's nothing to change if it's the same.
 	 */
-	if ((qf & flags) == flags && sbflags == 0)
+	if ((qf & flags) == flags)
 		return -EEXIST;
-	sbflags |= XFS_SB_QFLAGS;
 
-	if ((error = xfs_qm_write_sb_changes(mp, sbflags)))
+	if ((error = xfs_qm_write_sb_changes(mp, XFS_SB_QFLAGS)))
 		return error;
 	/*
 	 * If we aren't trying to switch on quota enforcement, we are done.
-- 
1.8.4.5



  parent reply	other threads:[~2014-12-18 15:37 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-18 15:37 [Cluster-devel] [PATCH 0/25 RFC v2] quota: Unify VFS and XFS quota interfaces Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 01/25] xfs: Remove useless test Jan Kara
2014-12-18 15:37 ` Jan Kara [this message]
2014-12-18 15:37 ` [Cluster-devel] [PATCH 03/25] xfs: Remove some useless flags tests Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 04/25] quota: Split ->set_xstate callback into two Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 05/25] quota: Wire up ->quota_{enable, disable} callbacks into Q_QUOTA{ON, OFF} Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 06/25] quota: Add ->quota_{enable, disable} callbacks for VFS quotas Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 07/25] ext4: Use generic helpers for quotaon and quotaoff Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 08/25] ocfs2: " Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 09/25] quota: Remove quota_on_meta callback Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 10/25] quota: Switch ->get_dqblk() and ->set_dqblk() to use bytes as space units Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 11/25] quota: Store maximum space limit in bytes Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 12/25] quota: Make Q_XQUOTASYNC support VFS quota syncing Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 13/25] quota: Don't store flags for v2 quota format Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 14/25] ocfs2: Move OLQF_CLEAN flag out of generic quota flags Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 15/25] quota: Cleanup flags definitions Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 16/25] quota: Verify flags passed to Q_SETINFO Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 17/25] quota: Make VFS quotas use new interface for getting quota info Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 18/25] quota: Wire up Q_GETXSTATE and Q_GETXSTATV calls to work with ->get_state Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 19/25] xfs: Remove some pointless quota checks Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 20/25] xfs: Convert to using ->get_state callback Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 21/25] gfs2: " Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 22/25] quota: Remove ->get_xstate and ->get_xstatev callbacks Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 23/25] quota: Make ->set_info use structure with neccesary info to VFS and XFS Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 24/25] xfs: Add support for Q_SETINFO Jan Kara
2014-12-18 15:37 ` [Cluster-devel] [PATCH 25/25] quota: Hook up Q_XSETQLIM for id 0 to ->set_info 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=1418917059-23870-3-git-send-email-jack@suse.cz \
    --to=jack@suse.cz \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).