drivers: 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.
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>
Showing
- drivers/block/paride/pg.c 4 additions, 3 deletionsdrivers/block/paride/pg.c
- drivers/block/paride/pt.c 10 additions, 9 deletionsdrivers/block/paride/pt.c
- drivers/char/apm-emulation.c 6 additions, 5 deletionsdrivers/char/apm-emulation.c
- drivers/char/applicom.c 5 additions, 4 deletionsdrivers/char/applicom.c
- drivers/char/ds1302.c 8 additions, 7 deletionsdrivers/char/ds1302.c
- drivers/char/ds1620.c 4 additions, 4 deletionsdrivers/char/ds1620.c
- drivers/char/dsp56k.c 14 additions, 13 deletionsdrivers/char/dsp56k.c
- drivers/char/dtlk.c 4 additions, 4 deletionsdrivers/char/dtlk.c
- drivers/char/generic_nvram.c 4 additions, 3 deletionsdrivers/char/generic_nvram.c
- drivers/char/genrtc.c 7 additions, 6 deletionsdrivers/char/genrtc.c
- drivers/char/i8k.c 4 additions, 3 deletionsdrivers/char/i8k.c
- drivers/char/ip2/ip2main.c 4 additions, 4 deletionsdrivers/char/ip2/ip2main.c
- drivers/char/lp.c 8 additions, 7 deletionsdrivers/char/lp.c
- drivers/char/mbcs.c 4 additions, 4 deletionsdrivers/char/mbcs.c
- drivers/char/mmtimer.c 4 additions, 3 deletionsdrivers/char/mmtimer.c
- drivers/char/mwave/mwavedd.c 22 additions, 22 deletionsdrivers/char/mwave/mwavedd.c
- drivers/char/nvram.c 6 additions, 5 deletionsdrivers/char/nvram.c
- drivers/char/nwflash.c 6 additions, 6 deletionsdrivers/char/nwflash.c
- drivers/char/pcmcia/cm4000_cs.c 6 additions, 5 deletionsdrivers/char/pcmcia/cm4000_cs.c
- drivers/char/pcmcia/cm4040_cs.c 4 additions, 3 deletionsdrivers/char/pcmcia/cm4040_cs.c
Loading
Please register or sign in to comment