From d4e6557baefd6649ac5ec2b1b841cfb9b97c3f69 Mon Sep 17 00:00:00 2001 From: Conrad Meyer Date: Thu, 1 Mar 2018 00:29:52 +0000 Subject: [PATCH] ffs: softdep_disk_write_complete: Quiesce spurious Coverity warning Coverity cannot determine that handle_written_indirdep() does not access uninitialized 'sbp' when flags argument is zero. So, simply move the initialization slightly sooner to silence the warning. No functional change. Reported by: Coverity Sponsored by: Dell EMC Isilon --- sys/ufs/ffs/ffs_softdep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 7d434a99f0be..b491d48a203b 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -10984,6 +10984,8 @@ softdep_disk_write_complete(bp) if (ump == NULL) return; + sbp = NULL; + /* * If an error occurred while doing the write, then the data * has not hit the disk and the dependencies cannot be processed. @@ -11026,7 +11028,6 @@ softdep_disk_write_complete(bp) /* * Ump SU lock must not be released anywhere in this code segment. */ - sbp = NULL; owk = NULL; while ((wk = LIST_FIRST(&bp->b_dep)) != NULL) { WORKLIST_REMOVE(wk);