From patchwork Thu Jul 26 10:05:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Lu X-Patchwork-Id: 173390 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 115F72C008C for ; Thu, 26 Jul 2012 20:08:12 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751765Ab2GZKGU (ORCPT ); Thu, 26 Jul 2012 06:06:20 -0400 Received: from va3ehsobe002.messaging.microsoft.com ([216.32.180.12]:29098 "EHLO va3outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751024Ab2GZKGQ (ORCPT ); Thu, 26 Jul 2012 06:06:16 -0400 Received: from mail120-va3-R.bigfish.com (10.7.14.247) by VA3EHSOBE010.bigfish.com (10.7.40.12) with Microsoft SMTP Server id 14.1.225.23; Thu, 26 Jul 2012 10:06:14 +0000 Received: from mail120-va3 (localhost [127.0.0.1]) by mail120-va3-R.bigfish.com (Postfix) with ESMTP id D81E0A02CD; Thu, 26 Jul 2012 10:06:13 +0000 (UTC) X-Forefront-Antispam-Report: CIP:163.181.249.108; KIP:(null); UIP:(null); IPV:NLI; H:ausb3twp01.amd.com; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VPS0(zzzz1202hzz8275bhz2dh668h839hd24he5bhf0ah107ah) Received: from mail120-va3 (localhost.localdomain [127.0.0.1]) by mail120-va3 (MessageSwitch) id 1343297172316286_9683; Thu, 26 Jul 2012 10:06:12 +0000 (UTC) Received: from VA3EHSMHS008.bigfish.com (unknown [10.7.14.236]) by mail120-va3.bigfish.com (Postfix) with ESMTP id 3F7671E006D; Thu, 26 Jul 2012 10:06:12 +0000 (UTC) Received: from ausb3twp01.amd.com (163.181.249.108) by VA3EHSMHS008.bigfish.com (10.7.99.18) with Microsoft SMTP Server id 14.1.225.23; Thu, 26 Jul 2012 10:06:11 +0000 X-WSS-ID: 0M7RIQ8-01-4HM-02 X-M-MSG: Received: from sausexedgep02.amd.com (sausexedgep02-ext.amd.com [163.181.249.73]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ausb3twp01.amd.com (Axway MailGate 3.8.1) with ESMTP id 2630810280A4; Thu, 26 Jul 2012 05:06:08 -0500 (CDT) Received: from sausexhtp01.amd.com (163.181.3.165) by sausexedgep02.amd.com (163.181.36.59) with Microsoft SMTP Server (TLS) id 8.3.192.1; Thu, 26 Jul 2012 05:06:24 -0500 Received: from sausexmb1.amd.com (163.181.3.156) by sausexhtp01.amd.com (163.181.3.165) with Microsoft SMTP Server id 8.3.213.0; Thu, 26 Jul 2012 05:06:08 -0500 Received: from storexbh1.amd.com ([10.1.1.17]) by sausexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 26 Jul 2012 05:06:08 -0500 Received: from sshaexmb1.amd.com ([10.237.2.11]) by storexbh1.amd.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 26 Jul 2012 06:06:06 -0400 Received: from aarontestpc.amd.com ([10.237.73.70]) by sshaexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 26 Jul 2012 18:05:58 +0800 From: Aaron Lu To: James Bottomley , Alan Stern CC: Jeff Garzik , Lin Ming , Jeff Wu , , , , , Aaron Lu , Aaron Lu Subject: [PATCH v3 7/7] block: genhd: add an interface to set disk's poll interval Date: Thu, 26 Jul 2012 18:05:29 +0800 Message-ID: <1343297129-28174-8-git-send-email-aaron.lu@amd.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1343297129-28174-1-git-send-email-aaron.lu@amd.com> References: <1343297129-28174-1-git-send-email-aaron.lu@amd.com> X-OriginalArrivalTime: 26 Jul 2012 10:05:58.0550 (UTC) FILETIME=[40E03360:01CD6B16] MIME-Version: 1.0 X-OriginatorOrg: amd.com Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Set the ODD's in kernel poll interval to 2s for the user in case the user is using an old distro on which udev will not set the system wide block parameter events_dfl_poll_msecs. Signed-off-by: Aaron Lu --- block/genhd.c | 23 +++++++++++++++++------ drivers/scsi/sr.c | 1 + include/linux/genhd.h | 1 + 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/block/genhd.c b/block/genhd.c index bdb3682..de9b9d9 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1619,6 +1619,19 @@ static void disk_events_workfn(struct work_struct *work) kobject_uevent_env(&disk_to_dev(disk)->kobj, KOBJ_CHANGE, envp); } +int disk_events_set_poll_msecs(struct gendisk *disk, long intv) +{ + if (intv < 0 && intv != -1) + return -EINVAL; + + disk_block_events(disk); + disk->ev->poll_msecs = intv; + __disk_unblock_events(disk, true); + + return 0; +} +EXPORT_SYMBOL(disk_events_set_poll_msecs); + /* * A disk events enabled device has the following sysfs nodes under * its /sys/block/X/ directory. @@ -1675,16 +1688,14 @@ static ssize_t disk_events_poll_msecs_store(struct device *dev, { struct gendisk *disk = dev_to_disk(dev); long intv; + int ret; if (!count || !sscanf(buf, "%ld", &intv)) return -EINVAL; - if (intv < 0 && intv != -1) - return -EINVAL; - - disk_block_events(disk); - disk->ev->poll_msecs = intv; - __disk_unblock_events(disk, true); + ret = disk_events_set_poll_msecs(disk, intv); + if (ret) + return ret; return count; } diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index b8c2f9d..d639bcc 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -862,6 +862,7 @@ static int sr_probe(struct device *dev) dev_set_drvdata(dev, cd); disk->flags |= GENHD_FL_REMOVABLE; add_disk(disk); + disk_events_set_poll_msecs(disk, 2000); sdev_printk(KERN_DEBUG, sdev, "Attached scsi CD-ROM %s\n", cd->cdi.name); diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 017a7fb..7414fb5 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -418,6 +418,7 @@ extern void disk_block_events(struct gendisk *disk); extern void disk_unblock_events(struct gendisk *disk); extern void disk_flush_events(struct gendisk *disk, unsigned int mask); extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask); +extern int disk_events_set_poll_msecs(struct gendisk *disk, long intv); /* drivers/char/random.c */ extern void add_disk_randomness(struct gendisk *disk);