From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DBC5BC2D0CB for ; Thu, 12 Dec 2019 19:01:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 97C732073D for ; Thu, 12 Dec 2019 19:01:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="rE2OUvxu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 97C732073D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id D2AE58E0007; Thu, 12 Dec 2019 14:01:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CDCFD8E0001; Thu, 12 Dec 2019 14:01:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B7BD08E0007; Thu, 12 Dec 2019 14:01:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0223.hostedemail.com [216.40.44.223]) by kanga.kvack.org (Postfix) with ESMTP id 9F3618E0001 for ; Thu, 12 Dec 2019 14:01:42 -0500 (EST) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id 1B709824999B for ; Thu, 12 Dec 2019 19:01:42 +0000 (UTC) X-FDA: 76257408444.22.heart73_2bdad5fcbb00c X-HE-Tag: heart73_2bdad5fcbb00c X-Filterd-Recvd-Size: 7071 Received: from mail-il1-f193.google.com (mail-il1-f193.google.com [209.85.166.193]) by imf31.hostedemail.com (Postfix) with ESMTP for ; Thu, 12 Dec 2019 19:01:41 +0000 (UTC) Received: by mail-il1-f193.google.com with SMTP id r81so2974895ilk.0 for ; Thu, 12 Dec 2019 11:01:41 -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 :mime-version:content-transfer-encoding; bh=fbpmMkO7cF3l0nX3uMERV011BvImxrSyna50D9UZcqY=; b=rE2OUvxuQQR9e+OCoGeKlkc1cUF+15y3F4LLwx3WdT9h9LKQx9Didy7wYh+VA3fSF7 +kBrzd+B6vQBJ0BrZhLXL5rA1NJtQb1kW55UJegziee7iRIJmTwOZof3aRylNyXxDQE/ 9NInFTkvbNMXc/kGMTruW1JYbiZlao4XdqjBv44yo0w9Nsoz+b8GvVSzNGWSO9pZ9KCi eryZPEPld3a91/bVkFB8/ZmFKbm8VB5H3+AlH/E+v/ywydEuAbDKyIcI5rxTFnd2AsLe EJQOubuj/XMvejkd3wuiuhsBsbnsxPEwo2TeWY//2ctQl8ezMe9JqMTrm393hK/J0Xhy ihVw== 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:mime-version:content-transfer-encoding; bh=fbpmMkO7cF3l0nX3uMERV011BvImxrSyna50D9UZcqY=; b=e5N3jBOoxJvyJMoQGLmjInRJMDuT4gzr4j4UPkib0GjA4RIbNkGaY2CzXFxrbalan/ OmQvptgRf8ANxRUrPAbYOKjCNuUBt+1KCoh1RcrcNFqq2Ylf5R095PW06tEBEGrkGFu8 1yZsAnv+iXUtpYLO53+PveIEYw5zV8GRfc3EZ5/iEXdu0ESRRnyXwviGanTQb2JXetyS so8S1atq6rIy8hhLksRvNz3voi7JEWE1YAGVPsjzy2YgMYsKuch8aMW72UGW+QMT1jTn Pjs50vjdOjWr6EVzqQPud+QsO1O0xCNhI4LYlDcAnisR5acXS5i/u4juL5LVsR/akdLh i1SA== X-Gm-Message-State: APjAAAWN35IKBHidgFDHRtKmMTeoMJCiZx3s+pG/0Ottc5s5CoLknHHc 7GtYaUBOB+RM8jW0vKFQwGnVOgwpU0H1JQ== X-Google-Smtp-Source: APXvYqyITTmNy4tNYMAf6rKh/QJj2zfjnSElNIDEYONualw6iMY3maR+LVOkyIy1eJVakzqREBT76g== X-Received: by 2002:a92:b657:: with SMTP id s84mr8881028ili.253.1576177300212; Thu, 12 Dec 2019 11:01:40 -0800 (PST) Received: from x1.thefacebook.com ([65.144.74.34]) by smtp.gmail.com with ESMTPSA id i22sm1957745ill.40.2019.12.12.11.01.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Dec 2019 11:01:39 -0800 (PST) From: Jens Axboe To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org Cc: willy@infradead.org, clm@fb.com, torvalds@linux-foundation.org, david@fromorbit.com, Jens Axboe Subject: [PATCH 2/5] mm: make generic_perform_write() take a struct kiocb Date: Thu, 12 Dec 2019 12:01:30 -0700 Message-Id: <20191212190133.18473-3-axboe@kernel.dk> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191212190133.18473-1-axboe@kernel.dk> References: <20191212190133.18473-1-axboe@kernel.dk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Right now all callers pass in iocb->ki_pos, just pass in the iocb. This is in preparation for using the iocb flags in generic_perform_write(). Signed-off-by: Jens Axboe --- fs/ceph/file.c | 2 +- fs/ext4/file.c | 2 +- fs/nfs/file.c | 2 +- include/linux/fs.h | 3 ++- mm/filemap.c | 8 +++++--- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 11929d2bb594..096c009f188f 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -1538,7 +1538,7 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, = struct iov_iter *from) * are pending vmtruncate. So write and vmtruncate * can not run at the same time */ - written =3D generic_perform_write(file, from, pos); + written =3D generic_perform_write(file, from, iocb); if (likely(written >=3D 0)) iocb->ki_pos =3D pos + written; ceph_end_io_write(inode); diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 6a7293a5cda2..9ffb857765d5 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -249,7 +249,7 @@ static ssize_t ext4_buffered_write_iter(struct kiocb = *iocb, goto out; =20 current->backing_dev_info =3D inode_to_bdi(inode); - ret =3D generic_perform_write(iocb->ki_filp, from, iocb->ki_pos); + ret =3D generic_perform_write(iocb->ki_filp, from, iocb); current->backing_dev_info =3D NULL; =20 out: diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 8eb731d9be3e..d8f51a702a4e 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -624,7 +624,7 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov= _iter *from) result =3D generic_write_checks(iocb, from); if (result > 0) { current->backing_dev_info =3D inode_to_bdi(inode); - result =3D generic_perform_write(file, from, iocb->ki_pos); + result =3D generic_perform_write(file, from, iocb); current->backing_dev_info =3D NULL; } nfs_end_io_write(inode); diff --git a/include/linux/fs.h b/include/linux/fs.h index 092ea2a4319b..bf58db1bc032 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3103,7 +3103,8 @@ extern ssize_t generic_file_read_iter(struct kiocb = *, struct iov_iter *); extern ssize_t __generic_file_write_iter(struct kiocb *, struct iov_iter= *); extern ssize_t generic_file_write_iter(struct kiocb *, struct iov_iter *= ); extern ssize_t generic_file_direct_write(struct kiocb *, struct iov_iter= *); -extern ssize_t generic_perform_write(struct file *, struct iov_iter *, l= off_t); +extern ssize_t generic_perform_write(struct file *, struct iov_iter *, + struct kiocb *); =20 ssize_t vfs_iter_read(struct file *file, struct iov_iter *iter, loff_t *= ppos, rwf_t flags); diff --git a/mm/filemap.c b/mm/filemap.c index 5d299d69b185..00b8e87fb9cf 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3292,10 +3292,11 @@ struct page *grab_cache_page_write_begin(struct a= ddress_space *mapping, EXPORT_SYMBOL(grab_cache_page_write_begin); =20 ssize_t generic_perform_write(struct file *file, - struct iov_iter *i, loff_t pos) + struct iov_iter *i, struct kiocb *iocb) { struct address_space *mapping =3D file->f_mapping; const struct address_space_operations *a_ops =3D mapping->a_ops; + loff_t pos =3D iocb->ki_pos; long status =3D 0; ssize_t written =3D 0; unsigned int flags =3D 0; @@ -3429,7 +3430,8 @@ ssize_t __generic_file_write_iter(struct kiocb *ioc= b, struct iov_iter *from) if (written < 0 || !iov_iter_count(from) || IS_DAX(inode)) goto out; =20 - status =3D generic_perform_write(file, from, pos =3D iocb->ki_pos); + pos =3D iocb->ki_pos; + status =3D generic_perform_write(file, from, iocb); /* * If generic_perform_write() returned a synchronous error * then we want to return the number of bytes which were @@ -3461,7 +3463,7 @@ ssize_t __generic_file_write_iter(struct kiocb *ioc= b, struct iov_iter *from) */ } } else { - written =3D generic_perform_write(file, from, iocb->ki_pos); + written =3D generic_perform_write(file, from, iocb); if (likely(written > 0)) iocb->ki_pos +=3D written; } --=20 2.24.1