kevin/linux
1
Fork 0
Code

xfs: fix CIL sparse lock context warnings

Browse Source 
Sparse reports:

fs/xfs/xfs_log_cil.c:1127:1: warning: context imbalance in 'xlog_cil_push_work' - different lock contexts for basic block
fs/xfs/xfs_log_cil.c:1380:1: warning: context imbalance in 'xlog_cil_push_background' - wrong count at exit
fs/xfs/xfs_log_cil.c:1623:9: warning: context imbalance in 'xlog_cil_commit' - unexpected unlock

xlog_cil_push_background() has a locking annotations for an rw_sem.
Sparse does not track lock contexts for rw_sems, so the
annotation generates false warnings. Remove the annotation.

xlog_wait_on_iclog() drops the log->l_ic_loglock. The function has a
sparse annotation, but the prototype in xfs_log_priv.h does not.
Hence the warning from xlog_cil_push_work() which calls
xlog_wait_on_iclog(). Add the missing annotation.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
This commit is contained in:
Dave Chinner 2024-04-03 08:28:28 +11:00 committed by Chandan Babu R
parent 9cb5f15d88
commit 2c03d9560e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/xfs_log_cil.c
View File

@ -1378,7 +1378,7 @@ out_abort_free_ticket:
*/ */
static void static void
xlog_cil_push_background( xlog_cil_push_background(
struct xlog *log) __releases(cil->xc_ctx_lock) struct xlog *log)
{ {
struct xfs_cil *cil = log->l_cilp; struct xfs_cil *cil = log->l_cilp;
int space_used = atomic_read(&cil->xc_ctx->space_used); int space_used = atomic_read(&cil->xc_ctx->space_used);

3
fs/xfs/xfs_log_priv.h
View File

@ -620,7 +620,8 @@ xlog_wait(
remove_wait_queue(wq, &wait); remove_wait_queue(wq, &wait);
} }
int xlog_wait_on_iclog(struct xlog_in_core *iclog); int xlog_wait_on_iclog(struct xlog_in_core *iclog)
__releases(iclog->ic_log->l_icloglock);
/* /*
* The LSN is valid so long as it is behind the current LSN. If it isn't, this * The LSN is valid so long as it is behind the current LSN. If it isn't, this