github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 02:53:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

xfs: consolidate q_qlock locking in xfs_qm_dqget and xfs_qm_dqget_inode

Browse Source 
Move taking q_qlock from the cache lookup / insert helpers into the
main functions and do it just before returning to the caller.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
This commit is contained in:
Christoph Hellwig 2025-11-10 14:22:59 +01:00 committed by Carlos Maiolino
parent 6b6e6e7521
commit 0494f04643
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fs/xfs/xfs_dquot.c
View File

@ -826,15 +826,13 @@ xfs_qm_dqget_cache_lookup(
trace_xfs_dqget_hit(dqp);
XFS_STATS_INC(mp, xs_qm_dqcachehits);
mutex_lock(&dqp->q_qlock);
return dqp;
}
/*
* Try to insert a new dquot into the in-core cache. If an error occurs the
* caller should throw away the dquot and start over. Otherwise, the dquot
* is returned locked (and held by the cache) as if there had been a cache
* hit.
* is returned (and held by the cache) as if there had been a cache hit.
*
* The insert needs to be done under memalloc_nofs context because the radix
* tree can do memory allocation during insert. The qi->qi_tree_lock is taken in
@ -861,8 +859,6 @@ xfs_qm_dqget_cache_insert(
goto out_unlock;
}
/* Return a locked dquot to the caller, with a reference taken. */
mutex_lock(&dqp->q_qlock);
lockref_init(&dqp->q_lockref);
qi->qi_dquots++;
@ -920,10 +916,8 @@ xfs_qm_dqget(
restart:
dqp = xfs_qm_dqget_cache_lookup(mp, qi, tree, id);
if (dqp) {
*O_dqpp = dqp;
return 0;
}
if (dqp)
goto found;
error = xfs_qm_dqread(mp, id, type, can_alloc, &dqp);
if (error)
@ -944,7 +938,9 @@ xfs_qm_dqget(
}
trace_xfs_dqget_miss(dqp);
found:
*O_dqpp = dqp;
mutex_lock(&dqp->q_qlock);
return 0;
}
@ -1019,10 +1015,8 @@ xfs_qm_dqget_inode(
restart:
dqp = xfs_qm_dqget_cache_lookup(mp, qi, tree, id);
if (dqp) {
*O_dqpp = dqp;
return 0;
}
if (dqp)
goto found;
/*
* Dquot cache miss. We don't want to keep the inode lock across
@ -1048,7 +1042,6 @@ xfs_qm_dqget_inode(
if (dqp1) {
xfs_qm_dqdestroy(dqp);
dqp = dqp1;
mutex_lock(&dqp->q_qlock);
goto dqret;
}
} else {
@ -1074,7 +1067,9 @@ xfs_qm_dqget_inode(
dqret:
xfs_assert_ilocked(ip, XFS_ILOCK_EXCL);
trace_xfs_dqget_miss(dqp);
found:
*O_dqpp = dqp;
mutex_lock(&dqp->q_qlock);
return 0;
}