scsi: autoconvert trivial BKL users to private mutex
All these files use the big kernel lock in a trivial
way to serialize their private file operations,
typically resulting from an earlier semi-automatic
pushdown from VFS.
None of these drivers appears to want to lock against
other code, and they all use the BKL as the top-level
lock in their file operations, meaning that there
is no lock-order inversion problem.
Consequently, we can remove the BKL completely,
replacing it with a per-file mutex in every case.
Using a scripted approach means we can avoid
typos.
file=$1
name=$2
if grep -q lock_kernel ${file} ; then
if grep -q 'include.*linux.mutex.h' ${file} ; then
sed -i '/include.*<linux\/smp_lock.h>/d' ${file}
else
sed -i 's/include.*<linux\/smp_lock.h>.*$/include <linux\/mutex.h>/g' ${file}
fi
sed -i ${file} \
-e "/^#include.*linux.mutex.h/,$ {
1,/^\(static\|int\|long\)/ {
/^\(static\|int\|long\)/istatic DEFINE_MUTEX(${name}_mutex);
} }" \
-e "s/\(un\)*lock_kernel\>[ ]*()/mutex_\1lock(\&${name}_mutex)/g" \
-e '/[ ]*cycle_kernel_lock();/d'
else
sed -i -e '/include.*\<smp_lock.h\>/d' ${file} \
-e '/cycle_kernel_lock()/d'
fi
Signed-off-by:
Arnd Bergmann <arnd@arndb.de>
Cc: linux-scsi@vger.kernel.org
Cc: "James E.J. Bottomley" <James.Bottomley@suse.de>
Showing
- drivers/message/fusion/mptctl.c 8 additions, 7 deletionsdrivers/message/fusion/mptctl.c
- drivers/message/i2o/i2o_config.c 12 additions, 11 deletionsdrivers/message/i2o/i2o_config.c
- drivers/scsi/3w-9xxx.c 3 additions, 4 deletionsdrivers/scsi/3w-9xxx.c
- drivers/scsi/3w-sas.c 3 additions, 4 deletionsdrivers/scsi/3w-sas.c
- drivers/scsi/3w-xxxx.c 4 additions, 5 deletionsdrivers/scsi/3w-xxxx.c
- drivers/scsi/aacraid/linit.c 8 additions, 7 deletionsdrivers/scsi/aacraid/linit.c
- drivers/scsi/ch.c 4 additions, 4 deletionsdrivers/scsi/ch.c
- drivers/scsi/dpt_i2o.c 9 additions, 9 deletionsdrivers/scsi/dpt_i2o.c
- drivers/scsi/gdth.c 6 additions, 5 deletionsdrivers/scsi/gdth.c
- drivers/scsi/megaraid.c 4 additions, 4 deletionsdrivers/scsi/megaraid.c
- drivers/scsi/megaraid/megaraid_mm.c 4 additions, 4 deletionsdrivers/scsi/megaraid/megaraid_mm.c
- drivers/scsi/megaraid/megaraid_sas.c 0 additions, 2 deletionsdrivers/scsi/megaraid/megaraid_sas.c
- drivers/scsi/mpt2sas/mpt2sas_ctl.c 6 additions, 5 deletionsdrivers/scsi/mpt2sas/mpt2sas_ctl.c
- drivers/scsi/osst.c 8 additions, 7 deletionsdrivers/scsi/osst.c
- drivers/scsi/scsi_tgt_if.c 0 additions, 2 deletionsdrivers/scsi/scsi_tgt_if.c
- drivers/scsi/sg.c 7 additions, 5 deletionsdrivers/scsi/sg.c
Loading
Please register or sign in to comment