mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-24 11:34:50 +08:00
2a48fc0ab2
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>
33 lines
957 B
C
33 lines
957 B
C
#include <linux/kernel.h>
|
|
#include <linux/ide.h>
|
|
#include <linux/hdreg.h>
|
|
#include <linux/mutex.h>
|
|
|
|
#include "ide-disk.h"
|
|
|
|
static DEFINE_MUTEX(ide_disk_ioctl_mutex);
|
|
static const struct ide_ioctl_devset ide_disk_ioctl_settings[] = {
|
|
{ HDIO_GET_ADDRESS, HDIO_SET_ADDRESS, &ide_devset_address },
|
|
{ HDIO_GET_MULTCOUNT, HDIO_SET_MULTCOUNT, &ide_devset_multcount },
|
|
{ HDIO_GET_NOWERR, HDIO_SET_NOWERR, &ide_devset_nowerr },
|
|
{ HDIO_GET_WCACHE, HDIO_SET_WCACHE, &ide_devset_wcache },
|
|
{ HDIO_GET_ACOUSTIC, HDIO_SET_ACOUSTIC, &ide_devset_acoustic },
|
|
{ 0 }
|
|
};
|
|
|
|
int ide_disk_ioctl(ide_drive_t *drive, struct block_device *bdev, fmode_t mode,
|
|
unsigned int cmd, unsigned long arg)
|
|
{
|
|
int err;
|
|
|
|
mutex_lock(&ide_disk_ioctl_mutex);
|
|
err = ide_setting_ioctl(drive, bdev, cmd, arg, ide_disk_ioctl_settings);
|
|
if (err != -EOPNOTSUPP)
|
|
goto out;
|
|
|
|
err = generic_ide_ioctl(drive, bdev, cmd, arg);
|
|
out:
|
|
mutex_unlock(&ide_disk_ioctl_mutex);
|
|
return err;
|
|
}
|