From: Andreas Gruenbacher <agruenba@redhat.com>
To: Christoph Hellwig <hch@lst.de>
Cc: Andreas Gruenbacher <agruenba@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>,
Al Viro <viro@zeniv.linux.org.uk>,
Christian Brauner <brauner@kernel.org>,
Gao Xiang <xiang@kernel.org>, Chao Yu <chao@kernel.org>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-erofs@lists.ozlabs.org, gfs2@lists.linux.dev
Subject: Re: [PATCH 8/8] gfs2: use lockref_init for qd_lockref
Date: Fri, 17 Jan 2025 17:03:51 +0100 [thread overview]
Message-ID: <20250117160352.1881139-1-agruenba@redhat.com> (raw)
In-Reply-To: <20250116043226.GA23137@lst.de>
On Thu, 16 Jan 2025 05:32:26 +0100, Christoph Hellwig <hch@lst.de> wrote:
> Well, if you can fix it to start with 1 we could start out with 1
> as the default. FYI, I also didn't touch the other gfs2 lockref
> because it initialize the lock in the slab init_once callback and
> the count on every initialization.
Sure, can you add the below patch before the lockref_init conversion?
Thanks,
Andreas
--
gfs2: Prepare for converting to lockref_init
First, move initializing the glock lockref spin lock from
gfs2_init_glock_once() to gfs2_glock_get().
Second, in qd_alloc(), initialize the lockref count to 1 to cover the
common case. Compensate for that in gfs2_quota_init() by adjusting the
count back down to 0; this case occurs only when mounting the filesystem
rw.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
fs/gfs2/glock.c | 3 ++-
fs/gfs2/main.c | 1 -
fs/gfs2/quota.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 8c4c1f871a88..22ff77cdd827 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -1201,8 +1201,9 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
if (glops->go_instantiate)
gl->gl_flags |= BIT(GLF_INSTANTIATE_NEEDED);
gl->gl_name = name;
- lockdep_set_subclass(&gl->gl_lockref.lock, glops->go_subclass);
gl->gl_lockref.count = 1;
+ spin_lock_init(&gl->gl_lockref.lock);
+ lockdep_set_subclass(&gl->gl_lockref.lock, glops->go_subclass);
gl->gl_state = LM_ST_UNLOCKED;
gl->gl_target = LM_ST_UNLOCKED;
gl->gl_demote_state = LM_ST_EXCLUSIVE;
diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c
index 04cadc02e5a6..0727f60ad028 100644
--- a/fs/gfs2/main.c
+++ b/fs/gfs2/main.c
@@ -51,7 +51,6 @@ static void gfs2_init_glock_once(void *foo)
{
struct gfs2_glock *gl = foo;
- spin_lock_init(&gl->gl_lockref.lock);
INIT_LIST_HEAD(&gl->gl_holders);
INIT_LIST_HEAD(&gl->gl_lru);
INIT_LIST_HEAD(&gl->gl_ail_list);
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 72b48f6f5561..df78eb8f35f9 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -236,7 +236,7 @@ static struct gfs2_quota_data *qd_alloc(unsigned hash, struct gfs2_sbd *sdp, str
return NULL;
qd->qd_sbd = sdp;
- qd->qd_lockref.count = 0;
+ qd->qd_lockref.count = 1;
spin_lock_init(&qd->qd_lockref.lock);
qd->qd_id = qid;
qd->qd_slot = -1;
@@ -298,7 +298,6 @@ static int qd_get(struct gfs2_sbd *sdp, struct kqid qid,
spin_lock_bucket(hash);
*qdp = qd = gfs2_qd_search_bucket(hash, sdp, qid);
if (qd == NULL) {
- new_qd->qd_lockref.count++;
*qdp = new_qd;
list_add(&new_qd->qd_list, &sdp->sd_quota_list);
hlist_bl_add_head_rcu(&new_qd->qd_hlist, &qd_hash_table[hash]);
@@ -1451,6 +1450,7 @@ int gfs2_quota_init(struct gfs2_sbd *sdp)
if (qd == NULL)
goto fail_brelse;
+ qd->qd_lockref.count = 0;
set_bit(QDF_CHANGE, &qd->qd_flags);
qd->qd_change = qc_change;
qd->qd_slot = slot;
--
2.47.1
next prev parent reply other threads:[~2025-01-17 16:04 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-15 9:46 lockref cleanups Christoph Hellwig
2025-01-15 9:46 ` [PATCH 1/8] lockref: remove lockref_put_not_zero Christoph Hellwig
2025-01-15 9:46 ` [PATCH 2/8] lockref: improve the lockref_get_not_zero description Christoph Hellwig
2025-01-15 13:28 ` Andreas Gruenbacher
2025-01-15 9:46 ` [PATCH 3/8] lockref: use bool for false/true returns Christoph Hellwig
2025-03-18 15:25 ` Mateusz Guzik
2025-03-18 15:51 ` Mateusz Guzik
2025-03-19 6:29 ` Christoph Hellwig
2025-03-19 12:04 ` Mateusz Guzik
2025-03-20 5:34 ` Christoph Hellwig
2025-01-15 9:46 ` [PATCH 4/8] lockref: drop superfluous externs Christoph Hellwig
2025-01-15 9:46 ` [PATCH 5/8] lockref: add a lockref_init helper Christoph Hellwig
2025-01-15 9:46 ` [PATCH 6/8] dcache: use lockref_init for d_lockref Christoph Hellwig
2025-01-15 20:13 ` Dave Chinner
2025-01-15 20:30 ` Al Viro
2025-01-16 5:03 ` Dave Chinner
2025-01-15 9:46 ` [PATCH 7/8] erofs: use lockref_init for pcl->lockref Christoph Hellwig
2025-01-15 9:49 ` Gao Xiang
2025-01-15 9:46 ` [PATCH 8/8] gfs2: use lockref_init for qd_lockref Christoph Hellwig
2025-01-15 13:35 ` Andreas Gruenbacher
2025-01-16 4:32 ` Christoph Hellwig
2025-01-17 16:03 ` Andreas Gruenbacher [this message]
2025-01-20 15:25 ` Christian Brauner
2025-01-20 15:44 ` Andreas Gruenbacher
2025-01-22 12:59 ` Christian Brauner
2025-01-15 10:50 ` lockref cleanups Christian Brauner
2025-01-22 20:40 ` Jeff Layton
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=20250117160352.1881139-1-agruenba@redhat.com \
--to=agruenba@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=brauner@kernel.org \
--cc=chao@kernel.org \
--cc=gfs2@lists.linux.dev \
--cc=hch@lst.de \
--cc=linux-erofs@lists.ozlabs.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=xiang@kernel.org \
/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
all inboxes | Powered by JetHome®