From patchwork Mon May 28 05:08:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ming X-Patchwork-Id: 161575 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EDECBB6FA1 for ; Mon, 28 May 2012 15:12:23 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753916Ab2E1FKN (ORCPT ); Mon, 28 May 2012 01:10:13 -0400 Received: from mga02.intel.com ([134.134.136.20]:32734 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752804Ab2E1FJT (ORCPT ); Mon, 28 May 2012 01:09:19 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 27 May 2012 22:09:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,352,1309762800"; d="scan'208";a="145291479" Received: from minggr.sh.intel.com ([10.239.36.45]) by orsmga001.jf.intel.com with ESMTP; 27 May 2012 22:09:16 -0700 From: Lin Ming To: Jeff Garzik , David Woodhouse , Aaron Lu , Holger Macht , Matthew Garrett Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH v4 13/13] [SCSI] sr: make sure ODD is in resumed state in block ioctl Date: Mon, 28 May 2012 13:08:40 +0800 Message-Id: <1338181720-4149-14-git-send-email-ming.m.lin@intel.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1338181720-4149-1-git-send-email-ming.m.lin@intel.com> References: <1338181720-4149-1-git-send-email-ming.m.lin@intel.com> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Aaron Lu When application tries to access the ODD's block device by ioctl, make sure ODD is in an active state. Signed-off-by: Aaron Lu Signed-off-by: Lin Ming --- drivers/scsi/sr.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 72488c2..3da0879 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -654,6 +654,13 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, void __user *argp = (void __user *)arg; int ret; + /* Make sure the ODD is not suspended */ + ret = pm_runtime_get_sync(&sdev->sdev_gendev); + if (ret < 0) { + pm_runtime_put_noidle(&sdev->sdev_gendev); + return -EACCES; + } + mutex_lock(&sr_mutex); /* @@ -685,6 +692,8 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, out: mutex_unlock(&sr_mutex); + pm_runtime_mark_last_busy(&cd->device->sdev_gendev); + pm_runtime_put_autosuspend(&cd->device->sdev_gendev); return ret; }