block: autoconvert trivial BKL users to private mutex
The block device drivers have all gained new lock_kernel
calls from a recent pushdown, and some of the drivers
were already using the BKL before.
This turns the BKL into a set of per-driver mutexes.
Still need to check whether this is safe to do.
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
- block/bsg.c 0 additions, 3 deletionsblock/bsg.c
- drivers/block/DAC960.c 6 additions, 5 deletionsdrivers/block/DAC960.c
- drivers/block/amiflop.c 10 additions, 9 deletionsdrivers/block/amiflop.c
- drivers/block/aoe/aoeblk.c 5 additions, 4 deletionsdrivers/block/aoe/aoeblk.c
- drivers/block/aoe/aoechr.c 5 additions, 4 deletionsdrivers/block/aoe/aoechr.c
- drivers/block/ataflop.c 8 additions, 7 deletionsdrivers/block/ataflop.c
- drivers/block/brd.c 4 additions, 3 deletionsdrivers/block/brd.c
- drivers/block/cciss.c 7 additions, 7 deletionsdrivers/block/cciss.c
- drivers/block/cpqarray.c 8 additions, 7 deletionsdrivers/block/cpqarray.c
- drivers/block/drbd/drbd_main.c 6 additions, 5 deletionsdrivers/block/drbd/drbd_main.c
- drivers/block/floppy.c 8 additions, 8 deletionsdrivers/block/floppy.c
- drivers/block/loop.c 6 additions, 5 deletionsdrivers/block/loop.c
- drivers/block/nbd.c 4 additions, 3 deletionsdrivers/block/nbd.c
- drivers/block/paride/pcd.c 8 additions, 7 deletionsdrivers/block/paride/pcd.c
- drivers/block/paride/pd.c 8 additions, 7 deletionsdrivers/block/paride/pd.c
- drivers/block/paride/pf.c 9 additions, 8 deletionsdrivers/block/paride/pf.c
- drivers/block/pktcdvd.c 8 additions, 8 deletionsdrivers/block/pktcdvd.c
- drivers/block/swim.c 8 additions, 7 deletionsdrivers/block/swim.c
- drivers/block/swim3.c 8 additions, 7 deletionsdrivers/block/swim3.c
- drivers/block/ub.c 8 additions, 7 deletionsdrivers/block/ub.c
Loading
Please register or sign in to comment