From patchwork Tue Feb 14 08:37:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 56764 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2846019wrn; Tue, 14 Feb 2023 00:44:58 -0800 (PST) X-Google-Smtp-Source: AK7set8+IqWxfBEMUVcR3jqExFT/okng29YjicCFuvxAAwGOCPn2jtU9LfxrNBeOWPtD+MO8UXvZ X-Received: by 2002:a17:907:124e:b0:8aa:c090:a9ef with SMTP id wc14-20020a170907124e00b008aac090a9efmr1413502ejb.55.1676364297848; Tue, 14 Feb 2023 00:44:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676364297; cv=none; d=google.com; s=arc-20160816; b=MmOsE3j0DtBOALbGPCC7lDowvDaXY4JqHUJYZRPS0tp4cirHBQBd76evZzSo3Bn5Y+ UR/vWWhIZ8wEhKrO/hRl6YMmkfgoV9PMhAIb2VGqVEkqosQ4e2z0DCi9r2G87PuSDn9Z LW8gd/K8KIQOa7HHEz5wPR+iLGa0rUclx9oIFnx1gYLY2xujQ5+d1fdFViTWOrvX7NCp xBImVMVDnB9tC9UuYWXkIwnJ20YT3u6KN2TD6ER5+6gufh3JmX0x75KNLmTlXLoLszNi r1kYpT6HpCBPecM/Z+HzrR5x1I1OH7kwPXK0vQfTPIneg1/4uT9vm6gEOGu/BdVNkQY9 wQlA== 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=xJXt4KNNFIdMvSSPmBpCRCAi8g0JFMLHorMyvAgfics=; b=OBoL2f2lUBsAF0BH7jX/YQldyG6UJObsIeoNLOhUR3FoLQxPpKVS/7baljaVUATWWr kkJlkJoesWHA9Jz84mvselHEMW2CzYDFbz/PFjAQSS8Ru1C3nGhA5RSQsfFRHczvv9of zVBo+xah0HeSz+Af2YZlCuOn6JXmaTtxA0/a9bJOl/6/iQJatxQ8aqK5dsUQKPN6Tgld vFhEJ85s5adgnxoX4FWdDfvNbTtFFVyq0kY7l9XeSfUKr/oouIMx8yX+h8VmmdxCX1Vg N/DbuHAeUn88wHsEmqM3hKUhrKymuZYvySnmfnCN5P+kmvBiE0Q1lAIj3YN+/obPGwuQ 5FkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=gIAH3LiN; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fl19-20020a1709072a9300b00787abcb1ce0si16835473ejc.679.2023.02.14.00.44.35; Tue, 14 Feb 2023 00:44:57 -0800 (PST) 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=@redhat.com header.s=mimecast20190719 header.b=gIAH3LiN; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232052AbjBNIjO (ORCPT + 99 others); Tue, 14 Feb 2023 03:39:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232083AbjBNIjA (ORCPT ); Tue, 14 Feb 2023 03:39:00 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC02BE386 for ; Tue, 14 Feb 2023 00:37:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676363852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xJXt4KNNFIdMvSSPmBpCRCAi8g0JFMLHorMyvAgfics=; b=gIAH3LiNKLVWbWoHrDW/yTd2ncPan6UF/YqqXlD6xnh+d+Z4sCZ3ZUHOgr+dCwRdi6dRKI clXPvg+2orcE9vI9x11UiC2mWfMkZvlEjJQkht7QRpi1/HfWuDOV/uSIaZJXEGRRotlIBZ DBHV0U1xqjr8PvoyjZwGm3AA59g/dW4= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-647-4m-qRrFTP7OlNbKg3ZIAJA-1; Tue, 14 Feb 2023 03:37:28 -0500 X-MC-Unique: 4m-qRrFTP7OlNbKg3ZIAJA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 14FC72999B22; Tue, 14 Feb 2023 08:37:28 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2717F140EBF6; Tue, 14 Feb 2023 08:37:26 +0000 (UTC) From: David Howells To: Jens Axboe , Al Viro , Christoph Hellwig Cc: David Howells , Matthew Wilcox , Jan Kara , Jeff Layton , David Hildenbrand , Jason Gunthorpe , Logan Gunthorpe , Hillf Danton , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Christoph Hellwig , John Hubbard Subject: [PATCH v3 3/5] splice: Use init_sync_kiocb() in filemap_splice_read() Date: Tue, 14 Feb 2023 08:37:08 +0000 Message-Id: <20230214083710.2547248-4-dhowells@redhat.com> In-Reply-To: <20230214083710.2547248-1-dhowells@redhat.com> References: <20230214083710.2547248-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757795370265246364?= X-GMAIL-MSGID: =?utf-8?q?1757795370265246364?= Use init_sync_kiocb() in filemap_splice_read() rather than open coding it. Requested-by: Christoph Hellwig Signed-off-by: David Howells cc: Christoph Hellwig cc: Jens Axboe cc: Al Viro cc: John Hubbard cc: David Hildenbrand cc: Matthew Wilcox cc: linux-block@vger.kernel.org cc: linux-fsdevel@vger.kernel.org cc: linux-mm@kvack.org --- Notes: ver #2) - Don't attempt to filter IOCB_* flags. fs/splice.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/splice.c b/fs/splice.c index 7c0ff187f87a..4ea63d6a9040 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -419,15 +419,14 @@ static ssize_t filemap_splice_read(struct file *in, loff_t *ppos, size_t len, unsigned int flags) { struct folio_batch fbatch; + struct kiocb iocb; size_t total_spliced = 0, used, npages; loff_t isize, end_offset; bool writably_mapped; int i, error = 0; - struct kiocb iocb = { - .ki_filp = in, - .ki_pos = *ppos, - }; + init_sync_kiocb(&iocb, in); + iocb.ki_pos = *ppos; /* Work out how much data we can actually add into the pipe */ used = pipe_occupancy(pipe->head, pipe->tail);