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 E9553C4167B for ; Tue, 5 Dec 2023 03:29:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 709526B0096; Mon, 4 Dec 2023 22:29:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6B9D46B0098; Mon, 4 Dec 2023 22:29:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5820A6B0099; Mon, 4 Dec 2023 22:29:24 -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 461516B0096 for ; Mon, 4 Dec 2023 22:29:24 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 20302A0E6A for ; Tue, 5 Dec 2023 03:29:24 +0000 (UTC) X-FDA: 81531334248.17.048AEDD Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf10.hostedemail.com (Postfix) with ESMTP id 359CEC0014 for ; Tue, 5 Dec 2023 03:29:21 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=R7q3p06Y; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf10.hostedemail.com: domain of gregkh@linuxfoundation.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701746962; 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=jaFBT+rnhxtZJ/h6fVB2juCIrYyAQdLH1+qqXPnVFFo=; b=jDD8dBcdTxRW1Tlu9Nz+QF4mfgxSBAJDzkLes6CReWNjXa91Wjf9LRT7jEzkWNysliQ14M moy2NeyMaDLplioq7N9Wh/cTs0OhQgmc1iGQF2fQlBtR4jsC0Lw8XX0jcDn0rwIjLNTkny eAdpKQ4r0M/+WepZcBKTYcHdjeUR5mY= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=R7q3p06Y; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf10.hostedemail.com: domain of gregkh@linuxfoundation.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701746962; a=rsa-sha256; cv=none; b=EQoUKnixXNGWB9SidwONVKH6WxHVHtdl+00MReMvqZXdbnMGHnTOvRe9yfqCAyem2fN6KQ /F9v/MdpMVnfCKY05eDKxRwGutg6pqdk1vkhhOs53bDSWcPMGf+ahdWTySn14XI7fS7iG0 tgsInov9aqmH017MXZKvIYrESpawUmU= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id 90E46B8171B; Tue, 5 Dec 2023 03:29:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 52C9CC433C7; Tue, 5 Dec 2023 03:29:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1701746959; bh=P/yPtLFfG6fs/aJ7nb2UKZ6poXbdL+X+6dXFbKCCxI0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R7q3p06YPmPIuY3Ycw/tuV7uJiOeogQYe9PRu1UAu3lGveNs/J3uxMMYrzG0SM/h5 zwQoHfmbFddIpucn52gIOfNn4IH5VKlvUtYdWKcpfoGC5S0zjTXLsyRFCR0ANaayAG GdoBbT2ezaEM2U/00dNv18GZP6k5DE4C8nePZIK8= 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.1 001/107] cifs: Fix FALLOC_FL_ZERO_RANGE by setting i_size if EOF moved Date: Tue, 5 Dec 2023 12:15:36 +0900 Message-ID: <20231205031531.545150790@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231205031531.426872356@linuxfoundation.org> References: <20231205031531.426872356@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: 359CEC0014 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: w7u5wyfpyh35z8bznk1d9fysb1pbd3fn X-HE-Tag: 1701746961-360818 X-HE-Meta: U2FsdGVkX19Su5NZtE4eSuc2TZc1Hnin52ASNwnbQTKnILMbZ/PGKyDR4AEsY4o9J7Yo2Mj64IxaeW64eZ9RjB6cdqPkyGL1wEZU2EtTeM9erN2c+lnbXodODNerxAD3b5Qqw+i/V85JOkAsBuy4F9Qw2kx0cgxbk8UPW/bfLFlNXiZ6X98a3ONu+2W52XC9R8AtcEMXbqjoOAC+MKstLzHNTDxteE0dXWdkXj+nLz//CNbOOF0boupiB0n84BuQK1qdvyKS02IFwgakBAK7WVOKh7LXhQRGtBCe1NjrfyNePTKq84txt+y8W/GUsQEVp9FGFqc7vuf9cL9geoNaQofWfIbbB3VkNr2+JYFsvycp1mJMdLb/wgqfedXfU80MnwHEDx6Yi9L857HmJwEgH9H4Hr80sUGM2S59qk6qvESGUx7o9+c9TWonIvXnMiHJEFRvs4nfL1sE5G3zBuhkIAxNH7ZuqLoDElQn2YkJdv1dCbDHoNqBJjfrP/Dyump/JGJT0PNSuzEjnrg1LnQemAFtE3zGWSAhauDFvGdZGiwzghsU9fQ+xwZ6Q1iw9UwIEub8FpFclQOn8+2GnNJdKav/5POO4wyYw7cAxbJvnxq5CwESaDsBn1d7LGScOz7COMs5pNnqOAEtBdkMryagF6aCR5yfk/cYkCWkMN7q8KrBE9WAtPhMj2OgcwEV67wN18WRpFqWLdPlu2A2cyrU2DSFrFBLHWzvnuK7A/BnS1aYGY/oB0ERkF74r3Ava8pIYYSlWtollQpBcTPpTYZ0JOcyZmfTGf1S2WHlxVxiWblJPm3Bj5UctAWBNVr3uIB2bEUhblEiTnoUpz3P4wPAJy9KaYMzxD57VhCcPQgjZWw29GoHF/C4ayip6QzP1orKZsMyobLVj1Z0sEVPmhKGRhMrPaIQgXNztCnrz30k5hmNezxCDA5jkBhhZCHb8zCsy4n9mm3l+mMNNoIJ+ZZ cIP4BZuO TfCPg/KxeJ1lckIkQaGhHlzR2pH81yj9Gcrn+usWRzOdi5OxiLvmJCyINQVz1C6H9diA1DGec1vJSCh3IXWBs+3XMqByDJ+iSa8jUMIuWWuFlvQcOjpOa1BZLYJKN9Yy3Lu7jX4jlHO68m7pwx4wb9x47kKABhMoGPcSZT/H3KZJGQj0vtRs0bYRMXJyyK7jVngKwkT8OqyEwn6ofCsd7L1gOWaC1NnLP1tx0HBkdGy7S4lBzWUyaU8P5ntJrHI26UDweSx5e4Ru0VRJMFGt1+qE1J4oDwwxMzlI+NXR6+UbjMXFzXhlRn+oeasdoLunvNSBO7d1k4KPkrEaGedQ1Z9Z3SvKBUuoLCwONkAuJ5vIdFBpb755UHpBZ+3mOLNhK8ONuy2zqsu1C6H5q/NZLjSehJJvHf+Dtt84if6gijGe52jndNbpjhFCg4bhVHPQ0GUppf7wHtxpRPLRNauQn4FL4NRgjZlMSpr1s15ljJEC/EbLNbKPOKOBbUb2Rrf7DJWq51jcH5OYfa2cEefdWldn5loWlPqjqv2wSt8W/8VfxbynfaB/bxESZTx92AOj86vtJ7Mks1dLJg37AwybqPm7s0onVk0T7q/Xcp1X4Wv+woSXN+vfhMotIrTOsYq7wfWvJ 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.1-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 @@ -3424,6 +3424,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; @@ -3454,10 +3455,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: