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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD272C4167B for ; Tue, 5 Dec 2023 03:20:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 46A496B0087; Mon, 4 Dec 2023 22:20:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 41A4D6B0089; Mon, 4 Dec 2023 22:20:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 309746B008C; Mon, 4 Dec 2023 22:20:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 1F4E46B0087 for ; Mon, 4 Dec 2023 22:20:31 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id EE8211A0511 for ; Tue, 5 Dec 2023 03:20:30 +0000 (UTC) X-FDA: 81531311820.20.CD7716A Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf11.hostedemail.com (Postfix) with ESMTP id 0327440003 for ; Tue, 5 Dec 2023 03:20:28 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=ayxy4AFz; spf=pass (imf11.hostedemail.com: domain of gregkh@linuxfoundation.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701746429; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=NGNdVjW2+w64lfUH/NEv/hqDfDMwA4NzkyWxLN8xuhA=; b=Fm3TbI4SA+7tKRPiaq3pJ4YVC4FL+1Eo7tjBTd4wHjCV2WBGb7Bl5oGyjPZp+pVonZwF6G JA5fLVxXBPCXGDfkam2Ii/25PInIzQI2ojz2pg5wEBzE2xQUoK7FyEuCeie9AMSCR0bzXU K6EF12GV2se2qMv1z2vs3q9w8eN8g2U= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=ayxy4AFz; spf=pass (imf11.hostedemail.com: domain of gregkh@linuxfoundation.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701746429; a=rsa-sha256; cv=none; b=cq2OofvgyoGAtqfdQx+LjJlwG+6nJNbhUNnbAYB/Alez35Z7LfiSSwqzYDQXI1pFsID0Yv xC4TCyEBENJEuiYLoQgflbrxArnk5o/eX5+CMtZyySF9YNqbBdpMKBIMRkG6laEwiUXBFG w/JzjpmkQucstpY9XuILbn7Axn41S8k= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id ED34EB80684; Tue, 5 Dec 2023 03:20:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E9C3CC433C7; Tue, 5 Dec 2023 03:20:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1701746426; bh=cro1T1Mu5sIqxCijRJAO7PnLliLrXWopztxriZw4Igs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ayxy4AFzCYGHx4tBk8hOLnKOdM3xP6wZ1y7agB4pxFha58JLS4YNaOcZaYU6J9gBm RsGoqSD8JZQwS9giTEdxgAL5pJxaeOVvuwhfQSfBHHIjYl/FwkmO7ALFXKxEwRRzIl uqx5hJ6ixOcdAbCCLesprdDqZ+W96isL8muY1d24= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Howells , Paulo Alcantara , Shyam Prasad N , Rohith Surabattula , Jeff Layton , linux-cifs@vger.kernel.org, linux-mm@kvack.org, Steve French Subject: [PATCH 6.6 002/134] cifs: Fix FALLOC_FL_ZERO_RANGE by setting i_size if EOF moved Date: Tue, 5 Dec 2023 12:14:34 +0900 Message-ID: <20231205031535.347165085@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231205031535.163661217@linuxfoundation.org> References: <20231205031535.163661217@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0327440003 X-Rspam-User: X-Stat-Signature: f1pceiachu557sccmid7rj4uugumxoeb X-Rspamd-Server: rspam01 X-HE-Tag: 1701746428-98304 X-HE-Meta: U2FsdGVkX1+8Z7JEOHxxe252xPnmbjFpC9IXz4EsD4GyC9ywQdqSnqgyxPp+CkWiBWMrfrEs2w9RpdgI1Wz4v+lIlOK7AShNwJZrEB8w8OCqAJzUvyur2wKzIr9Km6AP5BqbsVdJVCFUHPVp8mPLy0PAoC+h9RArSM6xWGSF8U+FJ7nh8QXFzTrg4wP69HDp4Wdzd9OCvht8CageMi2PuhJ2HNl0Jj4evxtZAu/uajmDKKxoShC4Whvc1AZddJsuY/ncdc3nkCI+cRygFKWzaKAOARSgd2DUbzyb8vzS4LzeNZVKovjoACKMk+CgJYhimuJcrq9MBFX5c6ecR/CxT4qX9BTty5tPzHLJBg7tFMy+wztf5isYOpdr6sW4Q1V3I214uni2nFuJEaf+3gBdE9t3S8re+WlEoFH8L7xB5DPoNrcYBcMp3Hlu4xAnSCxZ0GFWU3IkZi2f+aWIcia1Ot/WeP88QsGuRvCQ1JQJ8cqK1aCOwiyXwsxjnqEPxLwFqASgxZ21o02RMBbsLQCt2hzZujEYXaXLtCh8lryqocrTaZuyO0WdE+ZJYmvDh12Zl24mUhFa0LwQIspfqvSN+HoSIuH4nTYlkxYKfuVbrjMKG8wCDDH4byRrDhSZTLWKbSCmsDF0hH8kIMbwJurgdNdQm3WyMA7hzBIUTsfZ2I+MrXaIqjkaSjYj0Yw7B25nPpMKP1+YDerZz4oROx3WiKpNIefCss9KoD068jrldWrvHMJ6ySXrOrd0IZPt3xTFprhPkqrUNGlu8gBoEWxd3Dr0GIIGFbsOuj34GrqVfq4z+IbOojNdd4FWCU4xBWrkv3qG9XkdkuE5sAphaQ6X1yenKv44rN+qkg3VQpYQa1YklejTye6/FBuJcsdJEHVJyRgrWBX48vsYlmlfU+6OB12T7xppw10sUa4TLBloqijEwzJrwiuUgDZCRRQBAjcMq5vRlDmBSulLykyZBvd YJS6+XqK t3HWZDRfLUoeialNzoJxHm2hA+fc11tSFrCDuKcTqwzeKHslB8nX9cCuNqOUkzJUOlYt2ZGRBCa8jOjpzX2QfXVGSbJc3jZkPaohi98Knw4DS2qzeGgEivb6AmCgtEleVKuVKTsWNA5mhmZDWDxz13ureEXW6YX5CIvg6YPLogPxMfMoQW1FdjbOI+dwSqqWZ6DPHVGROREifYNIC5KbuQYGPM8QF1kOMXXfUwG2MLB9Yfw3gKbsbWwdbmEHL5z0XcXwol5/b+dqj8l+BmRrLBSlFOxxtq+d2KWUT+79x/+NBMuR/8+eXgOxSbQvWsdC6TeXzeQZxhu/1WtKQQDfdvOvDSzsY74J3LSEy7HgHdwnfUEyVpexvV0+rs7b0evTH8w+XisnOAKsMqH7RSgczWCdG4o8zspyp3AlD3JPFNxFhV+vJ1Fsc1zc5DHeKaQKIPVugA05aapLqqwVLU3z2Pppkb9rXVtN+0VuKAtiueAqg6N8qoE9p6xXWtzp9BXcRiUhdDAwBMdx+7IiO/0ObOSAsYthZ/XWwjl8Rs0pYMiBK54c3zusmtdDXm5+MbHjFJDsg4emzCxs86Y8dtjO/xGD87D1dt7pFH3nczw5PUJW4N+f1ZViYMwyluCc6Ngx9nUWR 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: List-Subscribe: List-Unsubscribe: 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Howells commit 83d5518b124dfd605f10a68128482c839a239f9d upstream. Fix the cifs filesystem implementations of FALLOC_FL_ZERO_RANGE, in smb3_zero_range(), to set i_size after extending the file on the server. Fixes: 72c419d9b073 ("cifs: fix smb3_zero_range so it can expand the file-size when required") Cc: stable@vger.kernel.org Signed-off-by: David Howells Acked-by: Paulo Alcantara cc: Shyam Prasad N cc: Rohith Surabattula cc: Jeff Layton cc: linux-cifs@vger.kernel.org cc: linux-mm@kvack.org Signed-off-by: Steve French Signed-off-by: Greg Kroah-Hartman --- fs/smb/client/smb2ops.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) --- a/fs/smb/client/smb2ops.c +++ b/fs/smb/client/smb2ops.c @@ -3305,6 +3305,7 @@ static long smb3_zero_range(struct file struct inode *inode = file_inode(file); struct cifsInodeInfo *cifsi = CIFS_I(inode); struct cifsFileInfo *cfile = file->private_data; + unsigned long long new_size; long rc; unsigned int xid; __le64 eof; @@ -3335,10 +3336,15 @@ static long smb3_zero_range(struct file /* * do we also need to change the size of the file? */ - if (keep_size == false && i_size_read(inode) < offset + len) { - eof = cpu_to_le64(offset + len); + new_size = offset + len; + if (keep_size == false && (unsigned long long)i_size_read(inode) < new_size) { + eof = cpu_to_le64(new_size); rc = SMB2_set_eof(xid, tcon, cfile->fid.persistent_fid, cfile->fid.volatile_fid, cfile->pid, &eof); + if (rc >= 0) { + truncate_setsize(inode, new_size); + fscache_resize_cookie(cifs_inode_cookie(inode), new_size); + } } zero_range_exit: