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.5 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,URIBL_BLOCKED,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 437A2C2D0C6 for ; Wed, 11 Dec 2019 15:29:57 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EB1292173E for ; Wed, 11 Dec 2019 15:29:56 +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="mRirhKAW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EB1292173E 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 777FF6B329E; Wed, 11 Dec 2019 10:29:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 72BCC6B329F; Wed, 11 Dec 2019 10:29:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5A4136B32A0; Wed, 11 Dec 2019 10:29:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0201.hostedemail.com [216.40.44.201]) by kanga.kvack.org (Postfix) with ESMTP id 459946B329E for ; Wed, 11 Dec 2019 10:29:54 -0500 (EST) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id E9D49824999B for ; Wed, 11 Dec 2019 15:29:53 +0000 (UTC) X-FDA: 76253245866.12.loaf00_1c28efd29dc3e X-HE-Tag: loaf00_1c28efd29dc3e X-Filterd-Recvd-Size: 7075 Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by imf40.hostedemail.com (Postfix) with ESMTP for ; Wed, 11 Dec 2019 15:29:53 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id h14so1963793pfe.10 for ; Wed, 11 Dec 2019 07:29:53 -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=2SQjS8rVUv97zNNTlgrJhbpMsmZd4fG/GoKGJP3eAKE=; b=mRirhKAWFljYMiRUx194SXEFEtebKFxO5ZD0NK7T1mtl+xUBGQ0Yst6hneUUfMFIM4 CJHbOUUL+TVItwq3msVkfmRDrIS9KiqYgo2pNJJbrxDuK8F/gG/+yjfC8g7Psp/LVVnu myC59YfNOnR6SVVu7c6EDfdojaNua5fvpx4rj4fe07ntRzZFwGGBF3ERckadrGtL+6lw 9/cmBdu5Lle5khBqRxuFR4w8QZDVienwJjKpMPXGvei+PZCY5rtWrPZ+bf6sr/rgrYx3 W+9MN296zoxWbl0Fw2HGYe5l30oDTQtOkwoyyR2k9l3iBbeMx/iDPfDQ6H6ySMx/jIry 0I/w== 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=2SQjS8rVUv97zNNTlgrJhbpMsmZd4fG/GoKGJP3eAKE=; b=U+yR48QnGTJTX750gFqzF6Y4xzu1C/DdipMjIlDGIIHJP25ArLTmA3Es8TinbSVdl/ r9YEB86emOBr9PZLla5AE6bQKVsvNNqTAkx9jhLdooZcfQ+3YRwc3q71jmP1jY/4hbuc fAE6V2Xd5CcYJm03YPM1oLRmCp7wpNF5aDENpT3O2BXyHf6ELIky3IjbA6JiZuu7TdRK 81HsCeVGwDbVU2D26fJQh0qv3Yb8BBAzEIl8uGSf8aP4KwbtO17cs/A+lpLTWdcRpDWC UL07srb6jWg87sY2hx6mTiy0XrBuKjKjU/1wajOaN0u4uguXgJpQEPey6VU8IUqa/t+2 sJ7g== X-Gm-Message-State: APjAAAUUBB34Ee+LDxm+eOBiIF280hax2V4JUsu7PQl9/t4TESnBuinz Q3jfzGsxGAIFNbQ4givqlThhB1LnUg4= X-Google-Smtp-Source: APXvYqxfuUbnRf2Sjrpa01+W+GiMj+MkirsJ7dKPdEmqQOm6hBolB0IKP27YH+ADkKThXrnkx7OuJw== X-Received: by 2002:a63:1d1a:: with SMTP id d26mr4544893pgd.98.1576078191917; Wed, 11 Dec 2019 07:29:51 -0800 (PST) Received: from x1.thefacebook.com ([2620:10d:c090:180::50da]) by smtp.gmail.com with ESMTPSA id n26sm3661882pgd.46.2019.12.11.07.29.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 07:29:50 -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: Wed, 11 Dec 2019 08:29:40 -0700 Message-Id: <20191211152943.2933-3-axboe@kernel.dk> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191211152943.2933-1-axboe@kernel.dk> References: <20191211152943.2933-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 ed23a11b3e34..fe37bd2b2630 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3302,10 +3302,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; @@ -3439,7 +3440,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 @@ -3471,7 +3473,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.0