From patchwork Tue Oct 16 03:11:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10642849 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 077C817D2 for ; Tue, 16 Oct 2018 03:11:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E92C5212DB for ; Tue, 16 Oct 2018 03:11:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DCD852988C; Tue, 16 Oct 2018 03:11:27 +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=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6BD36212DB for ; Tue, 16 Oct 2018 03:11:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EF38B6B0277; Mon, 15 Oct 2018 23:11:25 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id ECABA6B0278; Mon, 15 Oct 2018 23:11:25 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D94026B0279; Mon, 15 Oct 2018 23:11:25 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by kanga.kvack.org (Postfix) with ESMTP id AE6FC6B0277 for ; Mon, 15 Oct 2018 23:11:25 -0400 (EDT) Received: by mail-qk1-f200.google.com with SMTP id l75-v6so22094111qke.23 for ; Mon, 15 Oct 2018 20:11:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:subject:from:to:cc:date :message-id:in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=3p9QiOkfa8h9mw3zC6wMgXppY9cjHOCTYbdPvwFdVO8=; b=roCLF4qMWjf/crc0uHHQ9eMBpXVAdtXO7u2XPwxqSHXWurmONZh5wIhlQUGcmoVy8A J+t2pwJRkaTRRWVEiTxjlip776HR7zm4h2RAqX5dfrVIAVyni+nN5z3efETzuk5ZskQV 97g+Z+nOU/8y847sqYNR21xnHXjStHKu+XA2zhwNgzSRmycMATspK+PcM5GA3U5DXU9Y 3fUeed2wqk55gXeNzzHtF2JoCpcjnouD2ur8fzKCO4F8cy4v7zExIONl8ImxDCvR+jSZ FxKbknKnNvga1RCEuXUHQcaiXNskkHTPv5hM+f4a8T43UyvUXxBG/XvFG39bfPPWKYKc QbBw== X-Gm-Message-State: ABuFfog4HHmfyhR/6odpESlrpac3XO+euNC/OHNOdCIh5BOjVK+OwMmT sHfgpTaqbe1ksGxM6NQn9Wol1IKSut0FiWOfLUPQUDgZ808blP78kmnu1wTNce7hUsIFnGLfpb3 Qu6t6mKHZiqrY+M5bvM+JIYq7rsfyMN1u8P+ebE6yNx8GlfjRrWCxHepukHJy6+nTwQ== X-Received: by 2002:ac8:435b:: with SMTP id a27-v6mr18475668qtn.295.1539659485500; Mon, 15 Oct 2018 20:11:25 -0700 (PDT) X-Google-Smtp-Source: ACcGV62pXNCINEzzQ7JLzfdVvp5BHpSDaN3ltF4qbxoGDaGgivHwb0a861uT1hb6nRoO28V6Nc/1 X-Received: by 2002:ac8:435b:: with SMTP id a27-v6mr18475650qtn.295.1539659485040; Mon, 15 Oct 2018 20:11:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539659485; cv=none; d=google.com; s=arc-20160816; b=a3R5w9sBiBFA/I8Bx/V4gLASmq4kife/kM7R8F7bEp109Z4ZmCT5oLPnvIj+ZSKpzI PTfXWW34hfXB80hyG4eDUQVNX4g1QDZ2mvbIfrICfZn5ByhY6LeXqqpXn01YIV2ZGFYA EDV+a+nVB6RBCzsdZy6QknmHuzdI47g2QEDo0LDsS2+FNs0Dt5KxyMA2bLWrfzZmppst xYfxqMs/biUVrXjdlNvcn2wLidUVhG8HTSGgH9G/v28fkMecxjvEkRFIGtQiEG8JD0qA sWoUR0ly/3gHpyog1Uh8Mp3eecP3rlDJtSXk2KZ42L75DetT2S67QCTsZiLxLIPKS34q SRYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:cc:to:from:subject:dkim-signature; bh=3p9QiOkfa8h9mw3zC6wMgXppY9cjHOCTYbdPvwFdVO8=; b=f49pH45SMm1b9jhwUmDYzSTAykVH4kpMg9/SOQJ8raBQen/rSvSy6uiiKc++k+BKJ1 7LAHxGOl2DO2y+jMsBxCTh9zSlezsMpy8rV3XfggQrmNU1ttggs3AUGGW6w4eskEH6x9 6i+EzRgdD5OlOzZ1BYo1+Wf0bHuuBcsy/jMWwHGn1WBeSNbKT5ZW9BBas2jtVeKXvr3v 31WMrlQSWd4uXBTTEzZajn41jc+IuORZL9ZLgDydzXUc+C29MZ63UaVfTvm9F7UqKD7j w1xsfLXZ+XI7JSQdkjTlELAgV01mTXLh0A/KM98t4nqUqS9ndbXgLQ1NHP4w4eVdK+VC B+mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=K76nLdhT; spf=pass (google.com: domain of darrick.wong@oracle.com designates 156.151.31.85 as permitted sender) smtp.mailfrom=darrick.wong@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from userp2120.oracle.com (userp2120.oracle.com. [156.151.31.85]) by mx.google.com with ESMTPS id n7si3545865qvp.165.2018.10.15.20.11.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Oct 2018 20:11:25 -0700 (PDT) Received-SPF: pass (google.com: domain of darrick.wong@oracle.com designates 156.151.31.85 as permitted sender) client-ip=156.151.31.85; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=K76nLdhT; spf=pass (google.com: domain of darrick.wong@oracle.com designates 156.151.31.85 as permitted sender) smtp.mailfrom=darrick.wong@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w9G38gOw194183; Tue, 16 Oct 2018 03:11:23 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=3p9QiOkfa8h9mw3zC6wMgXppY9cjHOCTYbdPvwFdVO8=; b=K76nLdhT6z9//J9WzFChKCPByxZCJ3bcnKeQCRf7+O3k8IYOKZC23DpxdiJrv+Bk5xXQ xa1Nvo5eEQJMrMX15uCsVKr1pQV98+F+iZlkV7KaPHC/7FYkFKQmR+Tifepl9n/Ggx+B lHJ+ft5aXUUCXWDmlkwcMZ2vpeW/PKb3JxGpgjZygVNltJJXUp8JEfevSY1LyVnaW/5v 7hlLCmyTT6urnozlcbkCG0H2eKFUh9QLA/O/VoUvUZBhcCf3VbHSF2MHIpJbu5xRVw1k hKNnk7U2qw2NgyALk9dlvHm4ufqEHatYvfxg8G6JaIuIeI7YQTBVh9wdJHfmROQbOaPH 2w== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2n39br5rj5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 16 Oct 2018 03:11:23 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w9G3BLJR030688 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 16 Oct 2018 03:11:21 GMT Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w9G3BKo0004163; Tue, 16 Oct 2018 03:11:20 GMT Received: from localhost (/10.159.227.150) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 15 Oct 2018 20:11:20 -0700 Subject: [PATCH 12/26] vfs: pass remap flags to generic_remap_checks From: "Darrick J. Wong" To: david@fromorbit.com, darrick.wong@oracle.com Cc: sandeen@redhat.com, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, Amir Goldstein , linux-unionfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com Date: Mon, 15 Oct 2018 20:11:19 -0700 Message-ID: <153965947897.1256.9976516083702922569.stgit@magnolia> In-Reply-To: <153965939489.1256.7400115244528045860.stgit@magnolia> References: <153965939489.1256.7400115244528045860.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9047 signatures=668706 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=470 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1810160026 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: X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong Pass the same remap flags to generic_remap_checks for consistency. Signed-off-by: Darrick J. Wong Reviewed-by: Amir Goldstein Reviewed-by: Christoph Hellwig --- fs/read_write.c | 2 +- include/linux/fs.h | 2 +- mm/filemap.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/read_write.c b/fs/read_write.c index 201381689284..ebcbfc4f2907 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -1782,7 +1782,7 @@ int generic_remap_file_range_prep(struct file *file_in, loff_t pos_in, /* Check that we don't violate system file offset limits. */ ret = generic_remap_checks(file_in, pos_in, file_out, pos_out, len, - (remap_flags & REMAP_FILE_DEDUP)); + remap_flags); if (ret) return ret; diff --git a/include/linux/fs.h b/include/linux/fs.h index c2800953937a..1aa3bc1bb092 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2981,7 +2981,7 @@ extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *); extern ssize_t generic_write_checks(struct kiocb *, struct iov_iter *); extern int generic_remap_checks(struct file *file_in, loff_t pos_in, struct file *file_out, loff_t pos_out, - uint64_t *count, bool is_dedupe); + uint64_t *count, unsigned int remap_flags); 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 *); diff --git a/mm/filemap.c b/mm/filemap.c index 08ad210fee49..b0f1f6d93d9c 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3001,7 +3001,7 @@ EXPORT_SYMBOL(generic_write_checks); */ int generic_remap_checks(struct file *file_in, loff_t pos_in, struct file *file_out, loff_t pos_out, - uint64_t *req_count, bool is_dedupe) + uint64_t *req_count, unsigned int remap_flags) { struct inode *inode_in = file_in->f_mapping->host; struct inode *inode_out = file_out->f_mapping->host; @@ -3023,7 +3023,7 @@ int generic_remap_checks(struct file *file_in, loff_t pos_in, size_out = i_size_read(inode_out); /* Dedupe requires both ranges to be within EOF. */ - if (is_dedupe && + if ((remap_flags & REMAP_FILE_DEDUP) && (pos_in >= size_in || pos_in + count > size_in || pos_out >= size_out || pos_out + count > size_out)) return -EINVAL;