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

Commit 8e185d83 authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Linus Torvalds
Browse files

[PATCH] lockdep: annotate pktcdvd natural device hierarchy 



The pkt_*_dev functions operate on not-this-blockdevice, and that is
sufficiently checked at setup time.  As a result there is a natural
hierarchy, which needs nesting annotations

Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Cc: Peter Osterlund <petero2@telia.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1e86240f

drivers/block/pktcdvd.c

+3 −3
Original line number Diff line number Diff line
@@ -2577,19 +2577,19 @@ static int pkt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cm 
	case PKT_CTRL_CMD_SETUP:

		if (!capable(CAP_SYS_ADMIN))

			return -EPERM;

		mutex_lock(&ctl_mutex);

		mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);

		ret = pkt_setup_dev(&ctrl_cmd);

		mutex_unlock(&ctl_mutex);

		break;

	case PKT_CTRL_CMD_TEARDOWN:

		if (!capable(CAP_SYS_ADMIN))

			return -EPERM;

		mutex_lock(&ctl_mutex);

		mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);

		ret = pkt_remove_dev(&ctrl_cmd);

		mutex_unlock(&ctl_mutex);

		break;

	case PKT_CTRL_CMD_STATUS:

		mutex_lock(&ctl_mutex);

		mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);

		pkt_get_status(&ctrl_cmd);

		mutex_unlock(&ctl_mutex);

		break;