From patchwork Tue Aug 4 07:11:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 6934401 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 444859F39D for ; Tue, 4 Aug 2015 07:15:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 723AD20619 for ; Tue, 4 Aug 2015 07:15:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9226C205F7 for ; Tue, 4 Aug 2015 07:15:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754343AbbHDHO2 (ORCPT ); Tue, 4 Aug 2015 03:14:28 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:48086 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753479AbbHDHOT (ORCPT ); Tue, 4 Aug 2015 03:14:19 -0400 Received: from 212095007091.public.telering.at ([212.95.7.91] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZMWQU-0008Ql-49; Tue, 04 Aug 2015 07:14:18 +0000 From: Christoph Hellwig To: Jens Axboe Cc: linux-scsi@vger.kernel.org, linux-nvme@lists.infradead.org, dm-devel@redhat.com, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/6] dm: split out a helper to find the ioctl target Date: Tue, 4 Aug 2015 09:11:10 +0200 Message-Id: <1438672271-11309-6-git-send-email-hch@lst.de> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1438672271-11309-1-git-send-email-hch@lst.de> References: <1438672271-11309-1-git-send-email-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org See http://www.infradead.org/rpr.html Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We want to reuse this code for the persistent reservation handling, so move it into a helper. Signed-off-by: Christoph Hellwig --- drivers/md/dm.c | 50 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/drivers/md/dm.c b/drivers/md/dm.c index c68eb91..8dfc760 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -556,18 +556,16 @@ static int dm_blk_getgeo(struct block_device *bdev, struct hd_geometry *geo) return dm_get_geometry(md, geo); } -static int dm_blk_ioctl(struct block_device *bdev, fmode_t mode, - unsigned int cmd, unsigned long arg) +static int dm_get_ioctl_table(struct mapped_device *md, + struct dm_target **tgt, struct block_device **bdev, + fmode_t *mode, int *srcu_idx) { - struct mapped_device *md = bdev->bd_disk->private_data; - int srcu_idx; struct dm_table *map; - struct dm_target *tgt; - int r = -ENOTTY; + int r; retry: - map = dm_get_live_table(md, &srcu_idx); - + r = -ENOTTY; + map = dm_get_live_table(md, srcu_idx); if (!map || !dm_table_get_size(map)) goto out; @@ -575,8 +573,9 @@ retry: if (dm_table_get_num_targets(map) != 1) goto out; - tgt = dm_table_get_target(map, 0); - if (!tgt->type->ioctl) + *tgt = dm_table_get_target(map, 0); + + if (!(*tgt)->type->ioctl) goto out; if (dm_suspended_md(md)) { @@ -584,10 +583,32 @@ retry: goto out; } - r = tgt->type->ioctl(tgt, &bdev, &mode); + r = (*tgt)->type->ioctl(*tgt, bdev, mode); if (r < 0) goto out; + return r; + +out: + dm_put_live_table(md, *srcu_idx); + if (r == -ENOTCONN) { + msleep(10); + goto retry; + } + return r; +} + +static int dm_blk_ioctl(struct block_device *bdev, fmode_t mode, + unsigned int cmd, unsigned long arg) +{ + struct mapped_device *md = bdev->bd_disk->private_data; + struct dm_target *tgt; + int srcu_idx, r; + + r = dm_get_ioctl_table(md, &tgt, &bdev, &mode, &srcu_idx); + if (r < 0) + return r; + if (r > 0) { r = scsi_verify_blk_ioctl(NULL, cmd); if (r) @@ -595,15 +616,8 @@ retry: } r = __blkdev_driver_ioctl(bdev, mode, cmd, arg); - out: dm_put_live_table(md, srcu_idx); - - if (r == -ENOTCONN) { - msleep(10); - goto retry; - } - return r; }