Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c37927d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 

* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
  block: autoconvert trivial BKL users to private mutex
  drivers: autoconvert trivial BKL users to private mutex
  ipmi: autoconvert trivial BKL users to private mutex
  mac: autoconvert trivial BKL users to private mutex
  mtd: autoconvert trivial BKL users to private mutex
  scsi: autoconvert trivial BKL users to private mutex

Fix up trivial conflicts (due to addition of private mutex right next to
deletion of a version string) in drivers/char/pcmcia/cm40[04]0_cs.c
parents 5704e44d 2a48fc0a

block/bsg.c

+0 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <linux/uio.h>

#include <linux/idr.h>

#include <linux/bsg.h>

#include <linux/smp_lock.h>

#include <linux/slab.h>



#include <scsi/scsi.h>
@@ -843,9 +842,7 @@ static int bsg_open(struct inode *inode, struct file *file) 
{

	struct bsg_device *bd;



	lock_kernel();

	bd = bsg_get_device(inode, file);

	unlock_kernel();



	if (IS_ERR(bd))

		return PTR_ERR(bd);

drivers/block/DAC960.c

+6 −5
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include <linux/ioport.h>

#include <linux/mm.h>

#include <linux/slab.h>

#include <linux/smp_lock.h>

#include <linux/mutex.h>

#include <linux/proc_fs.h>

#include <linux/seq_file.h>

#include <linux/reboot.h>
@@ -54,6 +54,7 @@ 
#define DAC960_GAM_MINOR	252





static DEFINE_MUTEX(DAC960_mutex);

static DAC960_Controller_T *DAC960_Controllers[DAC960_MaxControllers];

static int DAC960_ControllerCount;

static struct proc_dir_entry *DAC960_ProcDirectoryEntry;
@@ -81,7 +82,7 @@ static int DAC960_open(struct block_device *bdev, fmode_t mode) 
	int drive_nr = (long)disk->private_data;

	int ret = -ENXIO;



	lock_kernel();

	mutex_lock(&DAC960_mutex);

	if (p->FirmwareType == DAC960_V1_Controller) {

		if (p->V1.LogicalDriveInformation[drive_nr].

		    LogicalDriveState == DAC960_V1_LogicalDrive_Offline)
@@ -99,7 +100,7 @@ static int DAC960_open(struct block_device *bdev, fmode_t mode) 
		goto out;

	ret = 0;

out:

	unlock_kernel();

	mutex_unlock(&DAC960_mutex);

	return ret;

}
@@ -6625,7 +6626,7 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request, 
  long ErrorCode = 0;

  if (!capable(CAP_SYS_ADMIN)) return -EACCES;



  lock_kernel();

  mutex_lock(&DAC960_mutex);

  switch (Request)

    {

    case DAC960_IOCTL_GET_CONTROLLER_COUNT:
@@ -7056,7 +7057,7 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request, 
      default:

	ErrorCode = -ENOTTY;

    }

  unlock_kernel();

  mutex_unlock(&DAC960_mutex);

  return ErrorCode;

}

drivers/block/amiflop.c

+10 −9
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
#include <linux/hdreg.h>

#include <linux/delay.h>

#include <linux/init.h>

#include <linux/smp_lock.h>

#include <linux/mutex.h>

#include <linux/amifdreg.h>

#include <linux/amifd.h>

#include <linux/buffer_head.h>
@@ -109,6 +109,7 @@ 
#define FD_HD_3 	0x55555555  /* high-density 3.5" (1760K) drive */

#define FD_DD_5 	0xaaaaaaaa  /* double-density 5.25" (440K) drive */



static DEFINE_MUTEX(amiflop_mutex);

static unsigned long int fd_def_df0 = FD_DD_3;     /* default for df0 if it doesn't identify */



module_param(fd_def_df0, ulong, 0);
@@ -1506,9 +1507,9 @@ static int fd_ioctl(struct block_device *bdev, fmode_t mode, 
{

	int ret;



	lock_kernel();

	mutex_lock(&amiflop_mutex);

	ret = fd_locked_ioctl(bdev, mode, cmd, param);

	unlock_kernel();

	mutex_unlock(&amiflop_mutex);



	return ret;

}
@@ -1555,11 +1556,11 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) 
	int old_dev;

	unsigned long flags;



	lock_kernel();

	mutex_lock(&amiflop_mutex);

	old_dev = fd_device[drive];



	if (fd_ref[drive] && old_dev != system) {

		unlock_kernel();

		mutex_unlock(&amiflop_mutex);

		return -EBUSY;

	}
@@ -1575,7 +1576,7 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) 
			rel_fdc();



			if (wrprot) {

				unlock_kernel();

				mutex_unlock(&amiflop_mutex);

				return -EROFS;

			}

		}
@@ -1594,7 +1595,7 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) 
	printk(KERN_INFO "fd%d: accessing %s-disk with %s-layout\n",drive,

	       unit[drive].type->name, data_types[system].name);



	unlock_kernel();

	mutex_unlock(&amiflop_mutex);

	return 0;

}
@@ -1603,7 +1604,7 @@ static int floppy_release(struct gendisk *disk, fmode_t mode) 
	struct amiga_floppy_struct *p = disk->private_data;

	int drive = p - unit;



	lock_kernel();

	mutex_lock(&amiflop_mutex);

	if (unit[drive].dirty == 1) {

		del_timer (flush_track_timer + drive);

		non_int_flush_track (drive);
@@ -1617,7 +1618,7 @@ static int floppy_release(struct gendisk *disk, fmode_t mode) 
/* the mod_use counter is handled this way */

	floppy_off (drive | 0x40000000);

#endif

	unlock_kernel();

	mutex_unlock(&amiflop_mutex);

	return 0;

}

drivers/block/aoe/aoeblk.c

+5 −4
Original line number Diff line number Diff line
@@ -12,9 +12,10 @@ 
#include <linux/slab.h>

#include <linux/genhd.h>

#include <linux/netdevice.h>

#include <linux/smp_lock.h>

#include <linux/mutex.h>

#include "aoe.h"



static DEFINE_MUTEX(aoeblk_mutex);

static struct kmem_cache *buf_pool_cache;



static ssize_t aoedisk_show_state(struct device *dev,
@@ -125,16 +126,16 @@ aoeblk_open(struct block_device *bdev, fmode_t mode) 
	struct aoedev *d = bdev->bd_disk->private_data;

	ulong flags;



	lock_kernel();

	mutex_lock(&aoeblk_mutex);

	spin_lock_irqsave(&d->lock, flags);

	if (d->flags & DEVFL_UP) {

		d->nopen++;

		spin_unlock_irqrestore(&d->lock, flags);

		unlock_kernel();

		mutex_unlock(&aoeblk_mutex);

		return 0;

	}

	spin_unlock_irqrestore(&d->lock, flags);

	unlock_kernel();

	mutex_unlock(&aoeblk_mutex);

	return -ENODEV;

}

drivers/block/aoe/aoechr.c

+5 −4
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <linux/completion.h>

#include <linux/delay.h>

#include <linux/slab.h>

#include <linux/smp_lock.h>

#include <linux/mutex.h>

#include <linux/skbuff.h>

#include "aoe.h"
@@ -37,6 +37,7 @@ struct ErrMsg { 
	char *msg;

};



static DEFINE_MUTEX(aoechr_mutex);

static struct ErrMsg emsgs[NMSG];

static int emsgs_head_idx, emsgs_tail_idx;

static struct completion emsgs_comp;
@@ -183,16 +184,16 @@ aoechr_open(struct inode *inode, struct file *filp) 
{

	int n, i;



	lock_kernel();

	mutex_lock(&aoechr_mutex);

	n = iminor(inode);

	filp->private_data = (void *) (unsigned long) n;



	for (i = 0; i < ARRAY_SIZE(chardevs); ++i)

		if (chardevs[i].minor == n) {

			unlock_kernel();

			mutex_unlock(&aoechr_mutex);

			return 0;

		}

	unlock_kernel();

	mutex_unlock(&aoechr_mutex);

	return -EINVAL;

}