From patchwork Tue Aug 1 17:21:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 129421 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2859363vqg; Tue, 1 Aug 2023 11:36:06 -0700 (PDT) X-Google-Smtp-Source: APBJJlH76D59LzVm/nS16uF/bhwzFRdkGf5NbJ6ejx9BywI6VdOa+/DzVkgxNb2lSE32SE1HqT5d X-Received: by 2002:aa7:cfd8:0:b0:522:586d:6f3a with SMTP id r24-20020aa7cfd8000000b00522586d6f3amr2817404edy.6.1690914965859; Tue, 01 Aug 2023 11:36:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690914965; cv=none; d=google.com; s=arc-20160816; b=GKOo15RCY3TRou1plUCDcF8TL7hhn6SkhNK3qp2TUddA//dTGeIudVy79uO1HJVUrV ulpzS0OjOlpH302xHGSRAxm8LjVcdEfxuY4HrLHbOb5wX0xMdI0idw94gIrx0iIpTzTK MCUateOP0ClPa8ERRwyn01pJ0ufFHyqtAaWK//KUlSX3ADmCywrH/ItgUU5y9v8KHsLr kZxWvJBoLU2EwSIhkNzErtzmVJ9jXIDSMQGFXxjlsXmmSLMpU4zVWF+MxUk+NeDFcbpm 2RgBO8T1o7misGVaVJ4dpHWE314ap7J/mMUxiZWr8lN1MfnGn2KGvpBpVkyXxvngRt32 ztOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fw7dM1JsVnVndL2bSWsxPXEp2IvCudbljLOvAhT8Np8=; fh=Svfif2WXOh+J00686hRMRNPC8OyhX/6znXEG9eRznxc=; b=ekfSRr+KxE+JaVNLrN7byZArHn/GDhCgjbL2NL0WhY7/WhFSeuOaVNupMG8eB4bGgD K7uwfU3pYkp26f5EQCLbDQYe5MDICh7lblPFTLmXgtKUmxFJQNm2Y3ufGibza0f/PMj3 DZuDgnD6Znq+Yx2jUJ5vQQOVZxt63L1jz1bheq/HqAFfcMn4ThRHoYS3+SOjM9UQwFg6 Euhw24xyZDC7jTX53qyHgEhvy8LNQT55JYQ8C6XEOiUH01iaNA+dup/GmWWLx6G3vXnp oTQAduS9a8Mawjo9IeYlYwk5hqRP1CkjHny3JbjBMAjYTrYMycpKYFJXsq+ObMQmo7ew 3slQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="YOi/w0no"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ay24-20020a056402203800b00522805b25b2si9071574edb.523.2023.08.01.11.35.30; Tue, 01 Aug 2023 11:36:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="YOi/w0no"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234560AbjHARWj (ORCPT + 99 others); Tue, 1 Aug 2023 13:22:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234581AbjHARW2 (ORCPT ); Tue, 1 Aug 2023 13:22:28 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 566642701; Tue, 1 Aug 2023 10:22:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=fw7dM1JsVnVndL2bSWsxPXEp2IvCudbljLOvAhT8Np8=; b=YOi/w0nofenlN5gIdk42JnisZa 6ySpZds34NUDRPdlbIJ9XMyFrBlwfvzJy4WTmeaPF7dJNEpoAm+2rI+hJxzWeiDnoH8VwNoJF0oJp H0ZXDuTHKY1yXEEg+9PA7rmiagtQSg+ALFlFLqmI10cmaNf7RF5J1+cmaEwg3ZTR1EoyZktOTmBsI lF8+53ZcFqDEgOXOrTX82JdWh/A8hgepiQGppexMN/PX4XH5OMI5uEOgrwTnBFot9A1R77EClVW3Z KjiuFDUbdVaudO5eYyVmB/VG1UqIuYWvOBWR8cr1rhI/qtW4TTN0XUjz3FjwFpOOm3qqLrkdjtzGN xRv3/F3w==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qQt4d-002uXB-1q; Tue, 01 Aug 2023 17:22:20 +0000 From: Christoph Hellwig To: Jens Axboe Cc: "Darrick J. Wong" , Andrew Morton , Matthew Wilcox , Christian Brauner , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Luis Chamberlain , Hannes Reinecke , Johannes Thumshirn Subject: [PATCH 4/6] block: stop setting ->direct_IO Date: Tue, 1 Aug 2023 19:21:59 +0200 Message-Id: <20230801172201.1923299-5-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230801172201.1923299-1-hch@lst.de> References: <20230801172201.1923299-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773052851270910447 X-GMAIL-MSGID: 1773052851270910447 Direct I/O on block devices now nevers goes through aops->direct_IO. Stop setting it and set the FMODE_CAN_ODIRECT in ->open instead. Signed-off-by: Christoph Hellwig Reviewed-by: Luis Chamberlain Reviewed-by: Hannes Reinecke Reviewed-by: Johannes Thumshirn --- block/fops.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/block/fops.c b/block/fops.c index 8a05d99166e3bd..f0b822c28ddfe2 100644 --- a/block/fops.c +++ b/block/fops.c @@ -428,7 +428,6 @@ const struct address_space_operations def_blk_aops = { .writepage = blkdev_writepage, .write_begin = blkdev_write_begin, .write_end = blkdev_write_end, - .direct_IO = blkdev_direct_IO, .migrate_folio = buffer_migrate_folio_norefs, .is_dirty_writeback = buffer_check_dirty_writeback, }; @@ -505,7 +504,7 @@ static int blkdev_open(struct inode *inode, struct file *filp) * during an unstable branch. */ filp->f_flags |= O_LARGEFILE; - filp->f_mode |= FMODE_BUF_RASYNC; + filp->f_mode |= FMODE_BUF_RASYNC | FMODE_CAN_ODIRECT; /* * Use the file private data to store the holder for exclusive openes.