613655fa39
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. These drivers do not seem to be under active maintainance from my brief investigation. Apologies to those maintainers that I have missed. 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> |
||
---|---|---|
.. | ||
board.h | ||
cirrus.h | ||
cmdblk.h | ||
cmdpkt.h | ||
daemon.h | ||
errors.h | ||
func.h | ||
host.h | ||
link.h | ||
linux_compat.h | ||
Makefile | ||
map.h | ||
param.h | ||
parmmap.h | ||
pci.h | ||
phb.h | ||
pkt.h | ||
port.h | ||
protsts.h | ||
rio_linux.c | ||
rio_linux.h | ||
rio.h | ||
rioboard.h | ||
rioboot.c | ||
riocmd.c | ||
rioctrl.c | ||
riodrvr.h | ||
rioinfo.h | ||
rioinit.c | ||
riointr.c | ||
rioioctl.h | ||
rioparam.c | ||
rioroute.c | ||
riospace.h | ||
riotable.c | ||
riotty.c | ||
route.h | ||
rup.h | ||
unixrup.h |