From patchwork Tue Mar 19 14:55:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13596737 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 977D264CF9 for ; Tue, 19 Mar 2024 14:56:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710860218; cv=fail; b=XH718T3mgzm+vsW5OUDF+9L+wS8g5mriX9uiVrwwQn4rDWwm+LVFCNpwSbVetjxZnqaurakYoAgn8tI+1C3XgIBRhfaNJFC2Ney5Qh5qeCFen8YBFKIW7wsWdAAipRnIpIONfgkWQdatxGoBSSoROjBFbJuSd0JihhzT9v8x5iA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710860218; c=relaxed/simple; bh=EbFDQdRgGPDDc28Su9rLXle82vMzjZ0PpclqLe3E34g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=bFL8FofL6KnLR5ZjTWzZ7egojvcoQszGWM+wVrIfvlrrtt+A+C1rb/Y8ScMizfYCGJh8FHDqLnSSkIKHL2fh9XYWO83gBIKKDUXPPDpiwuPXA/MWG4cwzIcYXns3noHEvGnGCwWEYZIEni55MBeaFOCZx+kPXAmpT/nmGFyGj4s= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=MCwMUDu4; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=QAOmOzUQ; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="MCwMUDu4"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="QAOmOzUQ" Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 42JAHTiT010230 for ; Tue, 19 Mar 2024 14:56:56 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=9cvcdPkzDOKHXbZ16Dw0Jut5AlVrhaJalG+oMu/J7Og=; b=MCwMUDu4X+PpSYwYcnu/bZ2gaj+xxubVjlU1Gh+gOQnsuesomY7/RbENUY6K7rIF7I61 rMBT82o2lOws1x1HXzIV6JmlyjRcvbd9sftsy42+V6VujbV6beg6ue3x6Y2J390wBW+m +3y5nxMe3urvAAJjgdZ+owK3RkZ4DjBWNvXDGZx2ft6mcIaZcNWhx7cXjMNLZV1+GMPk oaLlbgDsIfQKauCl5TTVpMzV9Rjx41BJJLtPqpFfdgTDsL2c3yvt7h6oPiZZJUEUmNsf KvdVfFpqkF0Xa1apBKxBTZOYYELQuDfeU2mmTy0Ope4gyQ6cMxRo6PpDPf0RO1Ue2bgg 0Q== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ww3yu5kus-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 19 Mar 2024 14:56:55 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 42JE6mIp003612 for ; Tue, 19 Mar 2024 14:56:54 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2101.outbound.protection.outlook.com [104.47.55.101]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3ww1v6c7hc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 19 Mar 2024 14:56:54 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UK8JnLA2oGRzhYzMhdOoslCoZ+Zwn4ANjLv9XknkiTUyr/BXeW6A4nmsGhWC6ddDK67n9LfdS9HGzG+KuHMVP/QTu/Yal7kxL5jQkrklw3jKqVUCHyv2qFxn6KMYvj8nIZiZb0jRrkwJuZxDx5tstGqSfKcxsBCOQMr7o/6hx6estkHL9/Db6JbfgJP2f8atq8TQpiW1UBDrTcu8fylHLtmXQc3QkDc9DQnSQecke6QxaM51ffL0GPqF+4Z2q8Q4hv2IQM3q8TcSpdsvQTeIqbzt6i9Jgfj3ukRH436BGsgQB1AcHs2mBcFeJON4r/ZsVGFEpwUBKwilI9avHOnvFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9cvcdPkzDOKHXbZ16Dw0Jut5AlVrhaJalG+oMu/J7Og=; b=kMTyt4ICiw3HLgwnzdsFc0cs2bimXLIYGEfzgSYFBe97UAZINy+pA1/enWY8nLYWqa13i/RSK1g1W7V3on8PW5aLQ1iBk41vGCSerjXKJX7vzhN2fUw6o7gt/Gw+yNcN+Uq5cDrRjDnPkVmn/vWMyKP6OsI7RnaWKbSzKVUh31PDrk1XFcEYmEmqDPI3FdV/0mvg0+7qDUcpcoHayOzL1ftxTwdWTKKXSAzhX0CPdsGFZ0ng1lMbG/Uz1RCZkp0IViykTcEYxhFmsrorM44XY8HtoXNay7ZzJl9UAcHmie3BZMKEdVgPh6xeLnT2o8pJxkrK1X4j0pDqcWsrJTROAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9cvcdPkzDOKHXbZ16Dw0Jut5AlVrhaJalG+oMu/J7Og=; b=QAOmOzUQmfppttAd+PHDWxO3sdnYHYjO1jabQOPyTz9MStcjy0xM2H0JhJIbmps4buqDF29Qbg3nGi8Jqz4+6eVVLq7DfDajOyUzUq9t2mUACRjtWNmyfKjv12aZ16mVLnT6eN9LrmVXHRl19P1PXDIv80gClt7g5AZ4/esNdio= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by CH3PR10MB7460.namprd10.prod.outlook.com (2603:10b6:610:15e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.28; Tue, 19 Mar 2024 14:56:52 +0000 Received: from PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::814:3d5c:443b:17b]) by PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::814:3d5c:443b:17b%7]) with mapi id 15.20.7386.025; Tue, 19 Mar 2024 14:56:52 +0000 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: Anand Jain Subject: [PATCH 06/29] btrfs: btrfs_setsize rename err to ret2 Date: Tue, 19 Mar 2024 20:25:14 +0530 Message-ID: X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: MA0PR01CA0108.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:af::13) To PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR10MB5706:EE_|CH3PR10MB7460:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jTx1yDqpGDecMX79SXDnrZYgiV5w8jK1sqqzuz4YvW0uJla/GqCxzHyO3zlHWWZw+RTLsGw/0WBFMhMiG1mR3UcL3dbSm5OirczH9pXCtd816C9hQG2QVEicY+ZzyeSHam57FrVDjsYuUVkAgRn5FPeSJaRJ0ACu2PRY9wtW9U74Wz7nZ6fnFzZAy/vFekX6NMU4s/n4PP307ZDrxvLXxy8PjoCDSqY3UsfzEVwvNX7kLsMiuJrLXuQvxaeptqa5lLlc5Sas9vU/Ut/ZvQVagv2lS55YJysL+aolvB4x/pvv26+42J6kX9jfeiUk6cjx9J/aNrZlM/V4KidOsACcPWzDlR2sn6BfujCyCLeB/BVEvf9E5npSoz291J6REsMGAZqUDqqQI0/yb2khxAgAkE4ZrwtZNm8FP5+Qh8pKeVwB0my2h3C7fwfk1hJ5B3Un5t1vytoVxUKtKKdVz2cJet49hbX6reqWK9pzyOxFFkMLrrYPROzIGxc9BijBHiEswvxgCw66+c2Nh+mezi99qcPuzGDbagCnkb5WOxJl7rlckZreqkAhTG+uKAsGmvv4O4neHbc7t0JkhaoBT9aay80TkLkrA/okVAMGkZV57tnJ91OJi5xeCfJzQDtjMXsb0lnlNJe/4ea/8/Fi/EJRSGk+wbHTQ+cL2wEd7hgutTs= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR10MB5706.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(1800799015)(376005)(366007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YI2gnoSWJuK5UpDOI+w9jUXjO73c32c46Ten28jvb555DWUKikPauhU5VWIk3MfZfg5lU5xuwSJFna7vbPi8D5JUWL8La5GwUQZH2yGpVP1EjcVDp7h/tI6nM92+WBfeHvR8BnBWKut0dVwazJ5I8BgqNqg1H4KlhRrwQucNhIkcuqCTOwqDRFeQF9Y3aZDR4FTsvqRS1gDjPVCybHCWRRN5762F6MBF8qUf+W/MbairFgGtQzy9/EnK7pprK3E/xCsdyPKVrcIR48wDaxfwExlFy2YTKwhEy5ixaRTPDFJrBJcOhncSfc+9wu9u4GRkiSZi8mLX/0/T9A+6BbTMRhicTnPuFOlg/oB/y5d/86b5zJ4NXr+OllKPx5WxBfAeCBFYI0n/9JrMlsiYW0h5tQBfR6mvsKD2RnGNc/FopCNS8Kot3dvQyZgd28csFWVpDimgRjLDJB9j57q0WguuPn6OUvwpGfAQuG58shr96Id1Gw2bbUs3kNr90/PwuKcMNf1I2G+FwoGXW+wSbYPUf4l4zPhoPRGmO3Z/8i4blUva0raMDXJx8izznovqoQhj0Jwbkkfk7u1yqmsLLrnG0sFHslKusUjiYpvJU7syVszr1C1hYdUF3j/xYQ4AtsgHSkFnxibREodB9LVE90/QIqUvqPGNtLB0alxmBrOolxJ+xpfuW+hBHfs43APK7ZY8cIGsI7MS0OYjcLJx1a592+FPN4XkWotJtVrIKKvlLV5VIhzLN2jpSyfmvv3xLUk59q21kyWHCPXC+pdZp17lnon6cF9k9+EiCwzym4uLAZZkhkPG2hkwYLXQ4HitvF6VmLHyKBnqTLkdZQQZAZVWo9cXtnj5VMTe+I8XRY9ojroJ5oDPUKps+HUYYT//3SuSaqcwv3pg3plyOLwB8fojfr+IoI6FGKJ04z86EKBrv9MamMc+JE4+eHLGmNJZV8iFCYOQ4H3cjk06QPaSEq6+lRpvjLd4nRLZV+dnPsWqr2gTHOxPSb0hvhUMGt9KXZfu26B4UidYEUnNcKJ6qaWn/ckrNWuhJEmIsL6bLri6A+BkIKlc6IFgM9G1XN1b+43OKqz6NKuXTaxaCYtUmK9246KeHVL9Dc25bNuk4uJ7fkxpJw3Acq1IrRo3U7y4ZBQ+VVIkqtODZWkcoUbU83JLJzsdK+s27417Q10Qx3TOTqiZFmVFi9PZ/HkYc88plBeU86Z/TriQenXPGUN29NpDqcCwZtywqqS9dhwyGRixt/QsXTmHb+h7bkomDyuecafAF+rX1/hfH5B/QKI13/V/syP8eyQzj2iTrH/VQRbrWg2DVeB6aZnWMiCICx5cFQ98QvO7mEgLz5hzoYkrfIrX3Na1OM3fxdPPudvxLvyP8HaEVHSeLvJFbSOnSVpZyXYCfsNEJ8WxUhLd6zziaMA2z6EOS3gZmyn53PWIu2tv3V4d2Nk5wvO+01vgUyqoZZLujp9x2MvKP9xVOIVuCUSef2cu/nEffDJjY2djvzczhhtaIvJ4E9NDN/fpkmk++bs/LAsYUy/TM8RccroGuYpaJzJUYdbciQoyTITdAu0TjDTxYntVaRgar03tMS/Btat5R+k/KD294tlhE3a3q9GScRlKksO94a3ah2nabdeAVsqwxWxgFXneT1vL186tqgJm X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: FeNOGtt0ojfE7ExHvYnDTx3LxY2YfgfkmIpDrxk9HErpZXmx/Jx+xh/2hbhiI0mVpMzon4cnpFWtf/Ad0HOAcivo4OHlwM4KwOzqRzhY9ohjASjoUpwgh+axRPUqaP+1vBVunIA6iiDkxet9VQTn86JOYTqH3T2pUiMAzxOeTf+N8NlbsAO3Nv1f6zlPk7lu84tr/Vs5zCTlx9fvxbhVuN7U9GcV/P7RRHat7YcH4xlRkI0iz+SFyIqRnptYXfthfivq2kx5uBQinodnhH0F1Kpo2JAcHUMxPv+ecuETSf2JWD6IEtbJRoryItAeKGrJB3ZElwiKyhlcrfiRZvK+cECGXY2s7D61cNQForrZHfNKY8myW+oTfZHtpi4mBUYupmdvzXpA7sSFgNLSP7gmSu5HitF6iRW04wV40yhO7C6BS6qhCo288TKoROdSgfUoN9WMbT7uWT/SwFWhAStKqrGWDh6uKcBn2qFshBxBWXql5Dux8rkjcDygPX1w3ds5zNGnPM7gV2S5IStamittgdg1oBVhS0jLAEtUYqzaDKnV1BsRAvfuF+bU+JRB9iT5V5E6rg3F0IYCngDxhnKrAda6k/vOajVIoNhJGqstjzg= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96d0ea54-e569-4937-e8d2-08dc4824cf95 X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Mar 2024 14:56:51.9574 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: GCH051vSDliZEcTW25EjgmSEQuQ3BGWx2f8mKFJS9Ekr5m8GP/vtcCIePY5QVrGgVqbmPNTY0KB9bUwJRDRGzQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7460 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-03-19_04,2024-03-18_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxscore=0 adultscore=0 spamscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2403140000 definitions=main-2403190113 X-Proofpoint-GUID: F2Zofn_fC2ajoEweidk-dBuPSX_zWiKU X-Proofpoint-ORIG-GUID: F2Zofn_fC2ajoEweidk-dBuPSX_zWiKU Simple renaming of the local variable err to ret2. Signed-off-by: Anand Jain --- fs/btrfs/inode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 27183225ac54..952c92e6dfcf 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -5077,7 +5077,7 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr) ret = btrfs_truncate(BTRFS_I(inode), newsize == oldsize); if (ret && inode->i_nlink) { - int err; + int ret2; /* * Truncate failed, so fix up the in-memory size. We @@ -5085,9 +5085,9 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr) * wait for disk_i_size to be stable and then update the * in-memory size to match. */ - err = btrfs_wait_ordered_range(inode, 0, (u64)-1); - if (err) - return err; + ret2 = btrfs_wait_ordered_range(inode, 0, (u64)-1); + if (ret2) + return ret2; i_size_write(inode, BTRFS_I(inode)->disk_i_size); } }