From patchwork Tue Jan 15 02:55:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10763857 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 032E414E5 for ; Tue, 15 Jan 2019 02:55:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E98832CB13 for ; Tue, 15 Jan 2019 02:55:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DDB042CB30; Tue, 15 Jan 2019 02:55:44 +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 8FC722CB13 for ; Tue, 15 Jan 2019 02:55:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727639AbfAOCzn (ORCPT ); Mon, 14 Jan 2019 21:55:43 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:46176 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727940AbfAOCzm (ORCPT ); Mon, 14 Jan 2019 21:55:42 -0500 Received: by mail-pl1-f194.google.com with SMTP id t13so555832ply.13 for ; Mon, 14 Jan 2019 18:55:42 -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=1Cwkp42pzc3TzLpFjXri5KnMaqYwKiBgOTq0zmwo8xgPZAdG50EEO8wcpb1oUYKpp4 2gtJiJAHu1CEEY41ldqr52/s9EtLU5a3wrlk69XdPf9MRm3cnrh9Lom4tv3eifFFcF7m ZuriRU5KN/NlwaiXYgqa0RgRX+CN/IJBGoyjQIIkr53H+6BW3+syTSebGtnRslOGUm6h 6P7usXboSByNTHRRbpCencI6EIpE60JFHZyqrTjTnV3kB2LH3LuQ8XJpfE9N7K2VnhyQ m7eVEEz1xcIzq42nWdfPTTIifaeH4vrrtO8Lva35r6noqjjtClQP9z2S5eggZoB5Wg1+ 7gYg== 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=oCxio9mVkx+FbODfnlyoqao8a7EePYSfHb0b2Bit4EqGWQjexr/BmOXgM3yWfU8VY0 RdZ+iZ9XbIuQq0XLsXWUs65lFsn7RvS6ByUy+7ypx5omDM0X9hFHd6rYarSTuuP1i7nC SjJtQE1pUOyjw9QJaZfI9W5HOWF5M7j+o08gZbbnxpo3luk1PU8x7k127Xg/F99BHfqS 2CuPA2c3BKsq3hj7APbkY7trbW8VNhDC9nuh5WqxJYhGWrGZsY5tZIwaX/2Fq8VLXo/c XK7Cew0M8Sjp1Depmyhdrah4X3nyKotKuy1J30fgx/0jzKO6uLxFwhpySllAPxuYLRUj 82ng== X-Gm-Message-State: AJcUukdgDHPABTnVW5feNnVeLhdiWhazWdH/2W0SkVZzAzhv35jAkOKA zaGimdCZIKtkDYO8bFUIy9+Vxj9tt2BOhw== X-Google-Smtp-Source: ALg8bN5dQy/eJUh933iBx5FO5OYoV3hAKueWRM3ZcQzQ4o7O1onoFCEW+tUl0uSEdzbj+zvmVsO9ZA== X-Received: by 2002:a17:902:43e4:: with SMTP id j91mr1721514pld.147.1547520941206; Mon, 14 Jan 2019 18:55:41 -0800 (PST) Received: from x1.localdomain (66.29.188.166.static.utbb.net. [66.29.188.166]) by smtp.gmail.com with ESMTPSA id c23sm2415544pfi.83.2019.01.14.18.55.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 18:55:40 -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/16] block: wire up block device iopoll method Date: Mon, 14 Jan 2019 19:55:17 -0700 Message-Id: <20190115025531.13985-3-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190115025531.13985-1-axboe@kernel.dk> References: <20190115025531.13985-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,