76a64921da
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: Karsten Keil <isdn@linux-pingi.de>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||
|---|---|---|
| .. | ||
| adapter.h | ||
| capi20.h | ||
| capidtmf.c | ||
| capidtmf.h | ||
| capifunc.c | ||
| capifunc.h | ||
| capimain.c | ||
| cardtype.h | ||
| cp_vers.h | ||
| dadapter.c | ||
| dadapter.h | ||
| debug.c | ||
| debug_if.h | ||
| debuglib.c | ||
| debuglib.h | ||
| dfifo.h | ||
| di.c | ||
| di.h | ||
| di_dbg.h | ||
| di_defs.h | ||
| did_vers.h | ||
| diddfunc.c | ||
| diva.c | ||
| diva.h | ||
| diva_didd.c | ||
| diva_dma.c | ||
| diva_dma.h | ||
| diva_pci.h | ||
| divacapi.h | ||
| divamnt.c | ||
| divasfunc.c | ||
| divasi.c | ||
| divasmain.c | ||
| divasproc.c | ||
| divasync.h | ||
| dqueue.c | ||
| dqueue.h | ||
| dsp_defs.h | ||
| dsp_tst.h | ||
| dspdids.h | ||
| dsrv4bri.h | ||
| dsrv_bri.h | ||
| dsrv_pri.h | ||
| entity.h | ||
| helpers.h | ||
| idifunc.c | ||
| io.c | ||
| io.h | ||
| istream.c | ||
| Kconfig | ||
| kst_ifc.h | ||
| maintidi.c | ||
| maintidi.h | ||
| Makefile | ||
| man_defs.h | ||
| mdm_msg.h | ||
| message.c | ||
| mi_pc.h | ||
| mntfunc.c | ||
| os_4bri.c | ||
| os_4bri.h | ||
| os_bri.c | ||
| os_bri.h | ||
| os_capi.h | ||
| os_pri.c | ||
| os_pri.h | ||
| pc.h | ||
| pc_init.h | ||
| pc_maint.h | ||
| pkmaint.h | ||
| platform.h | ||
| pr_pc.h | ||
| s_4bri.c | ||
| s_bri.c | ||
| s_pri.c | ||
| sdp_hdr.h | ||
| um_idi.c | ||
| um_idi.h | ||
| um_xdi.h | ||
| xdi_adapter.h | ||
| xdi_msg.h | ||
| xdi_vers.h | ||