From patchwork Wed Jan 16 17:49:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10766493 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 730D191E for ; Wed, 16 Jan 2019 17:50:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 635D12C622 for ; Wed, 16 Jan 2019 17:50:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 612362EF8E; Wed, 16 Jan 2019 17:50:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1408F2C622 for ; Wed, 16 Jan 2019 17:50:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727647AbfAPRuR (ORCPT ); Wed, 16 Jan 2019 12:50:17 -0500 Received: from mail-io1-f68.google.com ([209.85.166.68]:34605 "EHLO mail-io1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727025AbfAPRuQ (ORCPT ); Wed, 16 Jan 2019 12:50:16 -0500 Received: by mail-io1-f68.google.com with SMTP id b16so5618277ior.1 for ; Wed, 16 Jan 2019 09:50:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IbkWyHpTil5Vluy4ET88nT33hqg2kUPldnzNz+Wucw8=; b=03RZwsI0VTaQeXxlG9riS8jLgHxxhudxawPtWLsHtkr/CrEp7k6g7/cpg8993DwxvH Jj2anr8bJUpa9pmbNlN8EoeSObWlcjk2AGbymOgrHkiyXYDDizVaj/gmoqarq90Av/PX 1xxr05ki7S9lO4xfkdRA/l3EHSemq2eXf57PgmhsgRjmaNjJWZDHvnaZGKedXM/pSjtZ Znjn1f11qBCIn4grK0E4ES/DfxOfJWCAKkjvqVsJmc5slmW0+w4hnmB8Z1l2dCOSuHIO 0p5mEzVcl9xz0JhGVApYuPEytd/oxCuQZXxqBGzhdYlFSF8zx/TWwY51zqLAzIScIHBx Ud5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IbkWyHpTil5Vluy4ET88nT33hqg2kUPldnzNz+Wucw8=; b=juD2U8nj1pwlkuYuvD09dmK5Ypr+WXJs9zwgE83xPStt8AI9epWUoAb8PH+vhnnFtt en4fab+Iz3t3njOX0mpaP5kJODZWGpPVxW563x8l/4x2ZmtfZdmpw9kONWP4vvg8Yla1 G8IMeLAyBol95Adc2faZYUSop3R9VWR+9NBlNCX7MA13kREMia3QiwI1KQ3iUH3JfTN+ Z+ewQX28NW68CEpWOtaUBaFPmSEyThPME4nVdM6Hy5A6jfFxJCkih3JU3Ft3y/6ebSJ4 XHCJqpCTb+8q90B3i2TC0xz6KvVGV3t2E3Xafj/5OYpZ9rXByRjXMf6ik2Z2r9wqBdIR JsHQ== X-Gm-Message-State: AJcUukeykWElRSMh+3RP+QWCjMYi7QlIkzgQTmF8Ec2wrRa1hyy9Xlwh QmApRkRwGk3vhpKtyVyoZnWka1t+r6cA7Q== X-Google-Smtp-Source: ALg8bN6pO7dzG78Pzm3NKM+9GzunYbvzqO9ld+2Gr/8d/1MnNsKhyBdXzr+/fa0xzAnFP5lCU9FspA== X-Received: by 2002:a6b:7942:: with SMTP id j2mr5357166iop.71.1547661015097; Wed, 16 Jan 2019 09:50:15 -0800 (PST) Received: from x1.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id x128sm3705690itb.8.2019.01.16.09.50.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 09:50:14 -0800 (PST) From: Jens Axboe To: linux-fsdevel@vger.kernel.org, linux-aio@kvack.org, linux-block@vger.kernel.org, linux-arch@vger.kernel.org Cc: hch@lst.de, jmoyer@redhat.com, avi@scylladb.com, Jens Axboe Subject: [PATCH 02/15] block: wire up block device iopoll method Date: Wed, 16 Jan 2019 10:49:50 -0700 Message-Id: <20190116175003.17880-3-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190116175003.17880-1-axboe@kernel.dk> References: <20190116175003.17880-1-axboe@kernel.dk> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Christoph Hellwig Just call blk_poll on the iocb cookie, we can derive the block device from the inode trivially. Reviewed-by: Johannes Thumshirn Signed-off-by: Christoph Hellwig Signed-off-by: Jens Axboe --- fs/block_dev.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/fs/block_dev.c b/fs/block_dev.c index c546cdce77e6..5415579f3e14 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -279,6 +279,14 @@ struct blkdev_dio { static struct bio_set blkdev_dio_pool; +static int blkdev_iopoll(struct kiocb *kiocb, bool wait) +{ + struct block_device *bdev = I_BDEV(kiocb->ki_filp->f_mapping->host); + struct request_queue *q = bdev_get_queue(bdev); + + return blk_poll(q, READ_ONCE(kiocb->ki_cookie), wait); +} + static void blkdev_bio_end_io(struct bio *bio) { struct blkdev_dio *dio = bio->bi_private; @@ -396,6 +404,7 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages) bio->bi_opf |= REQ_HIPRI; qc = submit_bio(bio); + WRITE_ONCE(iocb->ki_cookie, qc); break; } @@ -2068,6 +2077,7 @@ const struct file_operations def_blk_fops = { .llseek = block_llseek, .read_iter = blkdev_read_iter, .write_iter = blkdev_write_iter, + .iopoll = blkdev_iopoll, .mmap = generic_file_mmap, .fsync = blkdev_fsync, .unlocked_ioctl = block_ioctl,