From patchwork Fri Jan 18 16:12:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10770769 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 85C0D13B5 for ; Fri, 18 Jan 2019 16:12:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 759CE2F3B0 for ; Fri, 18 Jan 2019 16:12:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 697BF2F562; Fri, 18 Jan 2019 16:12:40 +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 08B1D2F3B0 for ; Fri, 18 Jan 2019 16:12:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727630AbfARQMj (ORCPT ); Fri, 18 Jan 2019 11:12:39 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:40971 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727694AbfARQMj (ORCPT ); Fri, 18 Jan 2019 11:12:39 -0500 Received: by mail-pg1-f194.google.com with SMTP id m1so6256542pgq.8 for ; Fri, 18 Jan 2019 08:12:38 -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=wXOyearj2mP7U9VmTbWOONl0HmQKu/ENcDZMwE+/0blLQ1c6IbRaTQLWTCAgkiHT1j 0KMIcVHNgsaOwx29gm7Osqf2hB/cKpB88MdlVEZqmjdDtwXuuTWTHeOxPpTAuFLTfZM5 TmU+ZxewfGGUiqdN6o/IH6IVn3O7SLo/L8bMSUncPdukeQXl7mfTiQtB4en3sNec65tF QSBJdaVa8IiGs6ixCRFN9ysjBozR2ad7S78JI0lfr5+jebRCO1TgjK26OHYbxA6U17j+ 2WnLDY5lfagB6ZCCG3FHkF+arQJOi1+yMyffh42Syyx+jvOH/s8B7TOb2lQmHJf1SdpE BPCQ== 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=Xfh+oORhx2T51vGD0QapbVwm/5gfjqbSjmN3ABK5OlaoKtHztXGVuZOf2TU6+NLDMk hznATfQM3wO3Y3aAyN9s7YDQEJBvpnO+H3eLy96geoEJ8xtzzLiVqWIDCRab4Zs17d0d KLxoFde8O/c7ujsO4HGwp0kol3I6ISTWGUZ1ocBR/Pe/z9UbrjPFC+mlUzld3kRImcHq gXE/aIzrgNWhnVR7y/CaDLE/+B0Xk6jk4TemJq2y2sOnJIsbi25rVZ4Q3ehgieZuoKb9 dgcMh3U6gnzLa0kVViFnQyOXDi+d4AIgkyCgk/2CLZoWSX/DIcpWNdp9A5AwP6tvH2ox NzUA== X-Gm-Message-State: AJcUukcvcu3RzMGjqwiGmi9R9BdJaXAYI2kgBQV3hzJM+F7Sy9uVX32u Er1f2VWqpsRqm9rFc7yUKOt7pLl58ilW5A== X-Google-Smtp-Source: ALg8bN6Yz3Up/0axxhnVvTlvP7bc+l8vmNdlnaY86tKPutLhoeyKnqi+W6qtHT8SlmIAfwqTFauVyw== X-Received: by 2002:a63:6506:: with SMTP id z6mr18297332pgb.334.1547827957707; Fri, 18 Jan 2019 08:12:37 -0800 (PST) Received: from x1.localdomain (66.29.188.166.static.utbb.net. [66.29.188.166]) by smtp.gmail.com with ESMTPSA id m20sm5317804pgv.93.2019.01.18.08.12.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 08:12:36 -0800 (PST) From: Jens Axboe To: linux-fsdevel@vger.kernel.org, linux-aio@kvack.org, linux-block@vger.kernel.org Cc: hch@lst.de, jmoyer@redhat.com, avi@scylladb.com, Jens Axboe Subject: [PATCH 02/17] block: wire up block device iopoll method Date: Fri, 18 Jan 2019 09:12:10 -0700 Message-Id: <20190118161225.4545-3-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190118161225.4545-1-axboe@kernel.dk> References: <20190118161225.4545-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,