From patchwork Thu Apr 18 07:08:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13634229 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 9154C37719 for ; Thu, 18 Apr 2024 07:09:48 +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=1713424190; cv=fail; b=OIpNUnuYWeAgtyV18dAbJ1NEiUSS29/vw0q3EqDgIO5vAAK5YEvRGqBJ9SOP4YMDQpI1lLOLotopcViISgNRMGvCozvLo44tkuS1mXkmHlmCRbGGiiogzbFcRVZvz9dOnsHGBfzOVvCKkyl9gHZpT4gMm9VRJT+wJ6iIt70Wef0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713424190; c=relaxed/simple; bh=pUdKH5utbRwJ9KKP1GD35auBN609cdU6NwvtaC9j5Sg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=rit2WrblF/yApGPBI/iUB4vCA60tkzkiUimmkD5oG9wLSTQgd5yx6C4UhYU6xIp15U3daIUSB/9pHpjXmJXxpTGNAX5/YSa4mEHxuVT/ocr2gX5t4tvn0CcJZv9+KDmRWy1n8SMpcZkR+6jSJ1ELdrB6YW4KStw2ZqAz3FUygkw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=kDLVprp1; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=hZZXwguT; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="kDLVprp1"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="hZZXwguT" Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 43I3xM2H012092 for ; Thu, 18 Apr 2024 07:09:47 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=RDcC35vSQTtuQ9acw3Ybon1JBzf2WByTprD/5FQQ5Ug=; b=kDLVprp1JQ2EGRSbBKCV1fTHAetKBw+wqG5zYT4ByJTPeO7DUAy079a2xvTfP4/xQTRN ER08S9cAGuaNMe1FV1PcdUCp0u6bS6gGlANSa00P17Wx8QBXHzhbEBwnTGumLwcuiDOq wrdXcw+oy+IFYAAZo+oEknz7yQfACeYlNvPOlBDNqudcu4aO2gBrAHOEZb/qJ9nLBrYi 1CvLIFSvCGgcQ1foN8DUJ6GLeIc9O1n07rGmUFzuS4lfXBG4XcYN+36izlOhzsmA05r8 utYWffAjNGIJiN+4i0Sn24vaTUOUvbQft5Su1zmVEutxlxOJphX81ExaCa+AFpRxX3pQ vw== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xfgycsndf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Apr 2024 07:09:47 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 43I5ZLim029293 for ; Thu, 18 Apr 2024 07:09:46 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2169.outbound.protection.outlook.com [104.47.57.169]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3xfgg9y8r1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Apr 2024 07:09:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y3ssjv3YDIi7h+9yTgsYObVN+cwJVuoEQ4i3+peBF6jsNgjHVeETytmGKC3Ndn4uJYRq1EWh/YCJvMVkrb8m/t5dDWhccKxxnUZ14fDCqjhD8Ofi+plykIUw153j+4h2M5xDkmxld0KMXankKMOauzybATwgks/8/p4lybwgTGnMiae50fNMHAXQsXUVdhcTu7t/JJGI6GDkCY9itvYB2UszdVKy4BDz1MjoieMFB5BukoYbXsFcLjORhEP5sBHzLidG59Q9ktyrHRF3jMkxMCWXSXubp4xJwXTmGHFYl0PdPqGF1wM1fsf22uIW+OIRML/FuJXBzZsmYXKntXXayw== 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=RDcC35vSQTtuQ9acw3Ybon1JBzf2WByTprD/5FQQ5Ug=; b=WlZvjDvcZwbstpZen1ClwAXj21kpFgNeMpHlw9DzwOkvhNul+xXxvkouhSqsXl7+HhOxfhGmKDIuQ9aOx/hZZh0q1xlddCvkXQgnMd7kXAMsc6oUdiuAhyUEdW5vdwci11JV7lEr3L54jKHTqvOJqoOrYxjA7deVO7b9RjdISPJR4xKWTOx1BioZXHXFIyqlrCwB1BlcPUBA8UAJWvJHssFPyiHPZ4wkprPcfg44tqyOD5SkbZbS2tWq+05XpPlwvpedUtxZjlxTIcFN9sZz5aFskkwlH6XWrS6WAVcH2bpDmHTiYPLbfoMy922CBUPAxMXPTMr8poeGctydDyyBnA== 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=RDcC35vSQTtuQ9acw3Ybon1JBzf2WByTprD/5FQQ5Ug=; b=hZZXwguTrmN5sjdKB49Lfm11+DpdNrIAjFeV9fEApGv0BhEYk/s4brk1MWxMyAsVKSTiWarPombPyuXWuNN/DrVaLIHLrS+ZV+BB8n6TBdz70NJwVeKgRrfpRn53Ec9iMBDUVYpp3qDPx/kZwghwJyjlurjaqtXbR4VNz+bQtro= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by SA1PR10MB6592.namprd10.prod.outlook.com (2603:10b6:806:2be::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.50; Thu, 18 Apr 2024 07:09:39 +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.7472.037; Thu, 18 Apr 2024 07:09:39 +0000 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: Anand Jain Subject: [PATCH v2 01/11] btrfs: btrfs_cleanup_fs_roots handle ret variable Date: Thu, 18 Apr 2024 15:08:33 +0800 Message-ID: <5063cdad35934623ddefe8e49c4a2c105713beb3.1713370756.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: SGXP274CA0006.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::18) 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_|SA1PR10MB6592:EE_ X-MS-Office365-Filtering-Correlation-Id: eb97371c-c8d5-4d2b-3a14-08dc5f76832b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9OeXXUPu5DU8ixqUpqWs1Eu4MbLnGtbwz0yYhsnyQuk3aacQXWRvWXycv0p37o7kmfJ4lW5xEKSYaoSsIPl+fBi+XT5GrIbHwvAbgl6iW0G0tSyx0QQQjmerxvw0kArdhW5r5ABbe9mHI7N6CclvQEIWf+cKE6YtpRid71BUFn7AIlJEa5gs/iOOGkDGePf40zqR6klr9kApsL8R3II7tsmp4KlZK5auhSdGQ2EMHd4WqHEr84GynMJGpKrvkcb4TkOqU2daRYZ2Gb17xsOXnAlugiwb5Dta0Ewhmj7Oo5F9nAEVolTVZ7QuiA1meZZrOIE1oo28YolpdmwP3MJMK+4ppDkZLKgeHcWGsCXnHCsL7FVUXbFkV07qFmqVGsf/bXtB+ZN0jOw0pr3UuJYK8lLPAmxohcVC0hmxLVJJHTHTHRq4lDAcjkTCkZLMfzw7nNT5XkjhnC6Uh4W5HVjs7ndM98xbA13Dgff3E3MI6w6iKghjNi3rAYpV4cPctf1FUo1DqTK6UqUO421avQzDRpLc+is/hrVIg8QVySRmOuQTCVd/rgRd4fAhoGkcGSWSC3M15sbGeOA24p7zB6VIdG+YyWYHCzM7WUTCNfq+1GFAnwRdsaTTDj/pMB2ygK8kWuRVLS1Rtwnt4QzwM2CF1Johvjj9TAnPE9fvyYE4jT4= 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)(366007)(1800799015)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kR6jYY/wSYxNqn69QljmKY2xpvIMjuV19xnFM5NQohoG+MvIyX8HCVRz2jdHb+4uMHDSZd7El/pBt+0Bxj2ifVp6Xe0SVvlIYe2EdIfp3qSHS9sAByzJSrhl+bwwa1emr3kvJ8yEAW06ksIqSBvjByw8J5IZ07158sexyClXZbDrcizAzB4OKJjMP1YEp3xmzKFu/aZwj/F//1LVU86xQ97BKj9i5izZaCPGQ9sUXOQo5Jj5CIjXzgkmZ5Q7nMAup9+ZJSD8PHPTvcjgBeG95dTCXUmHl6ZSckDF9mcrc3rAtDvq57tNxlz4SnvQyLqUtwwuR/uphZ97mk5uAKIKau4XdW1ry13neh4MszAJTMTBzUUPv55hnCjHDdUQ6x9mjsz71+lEyneHxadSTX/jeajCHGlQkb77pAGSUACzsZapFBSm/JhYHeyFBZpXKzDxhviy4xOyM+bTFC7zUE3BipAwwNjVv+9FZkHYYOHuaTXxeJSTWUSmtLIB29MNfc11n0HIWgbU4D3cWPSifTiuovQFs8b23rKODkJDoFwaiFIem9evy8tQiA2tD8WIsLYnphEX7VDfUNtVqjgZmMMImaaNKzo3Kf2eujP1mo6RFWn5utzumLpF2iL4rq+aXb8fc8j/uUSsfYEPEjO7tu6EYNS+Yvk0m+Sxu+9u05yBVuc34Tr3ODj2i8wHfJDmD87fRRvgev/+V0Cy+LwWLZZ600lt6908Kt049WuQXPdydW5eatGeo4X4KuYDnIZ4qOpxzvZFCtO5a1uZnuFBQz2GSmBpmCoPu3cEKkJRoPNp/kBzTPWZEvV1CLQB2VQNOsBVqj+glEWJ7WzS9lt0s7aDYh1PJryDGTC8YabhHmKTU6iPyW+kRP8nnml8lDVWj3bCv5gMKwoqaonIDExPYR6ZLxDLQpIvxgDkVdkf6NHH8WQPBN82yOuHaqhtrviOtJ0DJYbS/aI7QKo/xp3Nect40R6P0bWPf9+RB3+8dsLJE8CVOigXT+7mzfxsirfId3f2zX6waEDCHeHEOEnvzUOoRZiE+d9M1NT1sfQbcC6itUGUQDHqn2zuYgot18BDhUv0m7HWPiaI/WZfUAbsvad+R45kFrz9E0SsKoX3l5TtenIM/7ybsAS6WlpsJtj08PtTYCO9cpwU0atUnD6hU/OvEgkpCaDdRDdqZfwTxN3McSCEuyLA0rMsXC1QClnM3Q69ppVJwIO2Gp/t+iRNrav+oDql3EKfOJUJqcgPrb4tlsrWRK3ZD+FidMefJ4+NXFWcwu8OT4nnV4rJZh7GMJV+KMALMX3pzQlD8jwT01wzpIOIlithjU3pv7wnwVfHn8oQXiDwOKOOSu8ZWsHDZ91lfcwuR+dL7xLMUrXEUH37jQjJCkDkl9MfhSS4V+SI8QpiGyB/5g4G9LebCkCbruVBSDs8s4faqpK1nRORM9hUUJWu46tVUz8kKewep1m5Xc721YZPetYLvLcoraNGFQoc9566R4xUm19dwpZjhD3E+CpJgXtzIiwWGdV1jpN4U7wpwqK9GR1zj9NRnJVIVBIGXnsAf4o/SOWsNn/7bKRlDNpXzF5Xbm3ez8I/7ah5iRp0 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: QdRLBfSOaXTswKbqCU2CUkLMLfzteCtgHxVY77wShlLFPwx8FH3zyqRdeO2MA0a+F3NUFLY7f3gZI3j2xMjP+H/XRF/7sflc/2AGGhrP/ogbUuvURSUeqyfLvHgQUo/qBgJO7Hk7yI890Y1PBlJhLKoHUDbfOzRSYJ+zOW5WSN8VOlyvEB4WuAjVJBB84XdTqTreQVjdBRHzHK8KT6NKy7Kbe4lJqoLAdNG82g1ulRrPTkHi17D+oyQU+v5Cy+7YzMh9/UOt5aIsG8o3WfHaE9BX3+cFqRmKPUpC+6U4/QQCNgWARhcQNu+o87WmyMxiblYNTw/aFBDmB+Y1ggkOq/yDVevkM9iayLP2Ys5jvV4NQU7IQSApNZ+46i9YHbHqg/b/Nn43QBQ8HZkMIb/Um+yQznVXGiVk6NsnESkBrJdlnh9Qc7vs4JAkDO1HTA/35YC8SDXYSFUP46Dx+UDJ7vWk1ou5NmxkRCu0MQ1aKE9zjXYYBveo15LliBzm9WaL8JXbqV85zzymT8dPaYZJajRDpfbgKTGuE5ZBG09yweDv1tN/e90HCZNr0rveHhLSA/d/3DizHPDMLnV4uHxGzFnaXiBp21orii3HGP9Wafc= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb97371c-c8d5-4d2b-3a14-08dc5f76832b X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 07:09:39.3757 (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: cOL+e32fwyR/G7/S1Dz9MqN0JjCbvjvVK/OHpbXC9yAzAadgb/pBXwz+0AElbkzlIXL7YVR99+6gk4KBnsTLng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6592 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-04-18_05,2024-04-17_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 spamscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 malwarescore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404180049 X-Proofpoint-ORIG-GUID: euc8ZKAxmxW-nHpUK3clsWerXMn-kvhn X-Proofpoint-GUID: euc8ZKAxmxW-nHpUK3clsWerXMn-kvhn Since err represents the function return value, rename it as ret, and rename the original ret, which serves as a helper return value, to found. Also, optimize the code to continue call btrfs_put_root() for the rest of the root if even after btrfs_orphan_cleanup() returns error. Signed-off-by: Anand Jain --- v2: Rename to 'found' instead of 'ret2' (Josef). Call btrfs_put_root() in the while-loop, avoids use of the variable 'found' outside of the while loop (Qu). Use 'unsigned int i' instead of 'int' (Goffredo). fs/btrfs/disk-io.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index c2dc88f909b0..d1d23736de3c 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -2926,22 +2926,23 @@ static int btrfs_cleanup_fs_roots(struct btrfs_fs_info *fs_info) { u64 root_objectid = 0; struct btrfs_root *gang[8]; - int i = 0; - int err = 0; - unsigned int ret = 0; + int ret = 0; while (1) { + unsigned int i; + unsigned int found; + spin_lock(&fs_info->fs_roots_radix_lock); - ret = radix_tree_gang_lookup(&fs_info->fs_roots_radix, + found = radix_tree_gang_lookup(&fs_info->fs_roots_radix, (void **)gang, root_objectid, ARRAY_SIZE(gang)); - if (!ret) { + if (!found) { spin_unlock(&fs_info->fs_roots_radix_lock); break; } - root_objectid = btrfs_root_id(gang[ret - 1]) + 1; + root_objectid = btrfs_root_id(gang[found - 1]) + 1; - for (i = 0; i < ret; i++) { + for (i = 0; i < found; i++) { /* Avoid to grab roots in dead_roots. */ if (btrfs_root_refs(&gang[i]->root_item) == 0) { gang[i] = NULL; @@ -2952,24 +2953,20 @@ static int btrfs_cleanup_fs_roots(struct btrfs_fs_info *fs_info) } spin_unlock(&fs_info->fs_roots_radix_lock); - for (i = 0; i < ret; i++) { + for (i = 0; i < found; i++) { if (!gang[i]) continue; root_objectid = btrfs_root_id(gang[i]); - err = btrfs_orphan_cleanup(gang[i]); - if (err) - goto out; + if (!ret) + ret = btrfs_orphan_cleanup(gang[i]); btrfs_put_root(gang[i]); } + if (ret) + break; + root_objectid++; } -out: - /* Release the uncleaned roots due to error. */ - for (; i < ret; i++) { - if (gang[i]) - btrfs_put_root(gang[i]); - } - return err; + return ret; } /* From patchwork Thu Apr 18 07:08:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13634230 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 26CE52D057 for ; Thu, 18 Apr 2024 07:09:48 +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=1713424190; cv=fail; b=eHCui4hnTKl0q5TIqO7qUIspRfoGeKzpSabJ/1Rp0hxZDIHPyv8C3qu9k9vtQskqx2ueH7VfbI26Sm6KP4cYDH2PO612laPthG0A+fMBw5P7s4PNx+K45NiLoV11AoiAyxIDKMn+mFI8mSfTTzaz7pRHg/Bx65Ibdim9VnQXOyY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713424190; c=relaxed/simple; bh=uqW6ZffV0WtvOy2ZiaXEznkP8aJWO8KGwAN2vdUqEGU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=E7JEN2nm6D5qNEddQIvNNunjn44MsxqiYj5HmPKqzQfU9GA5VcoAhQckBGzXO08xX3w1DV54jwWltFwYVeMPh6pvD5BmOM8vFLI3YwMavVV3etKaePc49L0sSJ9zrQ09dkpZB+C6bfnoTaAJW0pceTbNLbxYyV+jKhGa8PA5P/U= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=JHE2n4/b; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=bFxhjfC+; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="JHE2n4/b"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="bFxhjfC+" Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 43I3x1H6007679; Thu, 18 Apr 2024 07:09:47 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=1XGrUsx0tMcN4hQa0nb9auuJRHrmZ6FkMU9jC4cGWPg=; b=JHE2n4/b3pUeQ/386r7wLXOzE5fz2ECUKEqlMennGupzUNgtXeulrwS0qF/v38CrZWvd FLln5LGbQD4tTsIJA/6o70ogxClVz72Q0dULWhFdLWYBh/tueXt7/IoObd5YVfEYIYfe b/v5mA3v1CW5gVcNHqXYKEWcBhqSvNEq/r4dvluMIvPK+DKdgvHEGCoyTjRrLPC+BynV ozdr7jsUxv6iXK3Om7rwkyLnJqBP5d57pyGmXGFWTSVDuOgfCy80RIqN09mdK09IbBiT pylpQ9j9htpdD4DbTIc5uwlvBokzPlHNf4bNU2frvHAQ3v+x/Bz4smtU/BoL2hT7qeiN fA== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xfgn2smt2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 Apr 2024 07:09:47 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 43I5ZLin029293; Thu, 18 Apr 2024 07:09:46 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2169.outbound.protection.outlook.com [104.47.57.169]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3xfgg9y8r1-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 18 Apr 2024 07:09:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VQwa5pykysR+tXawzE9DAc1BR4PgTg1iJk0lvUYQatbHiQrqes/8TUZ3Pr8AV+eatXMbYnXAPq3ghtsQpa2HCFq3CgRso/6cRNMzKh/OV6dVPQ76HOnFumk3Ysqn49CeG5cBLh3GDm/FhDi0vbImAwQz6Pp0VlqyUdzP2nGrGmcE4pGTltTarjE8zwatFnWRTHXs9R3SyKHhr9G11jpOiP+OHIrHW6hAsTu+u+qpB9s5n0zms1+9bOf20yfBSiBd+eCwxwXsy243fatWMm8cOOB8iV1YxCL4Pz8OrTd6Uve0bWYOZ2Wvznwhqfvlsbe7IGxWDqME55j+CShIu4NV+Q== 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=1XGrUsx0tMcN4hQa0nb9auuJRHrmZ6FkMU9jC4cGWPg=; b=Z88vYgbgPliPX18Dpe1zM5Z51hy+zeoVaoNKT3JTdoiWqxZnVKB6JWBmtHId/uxcWVozGbPBuJLyhMJJekAeTFyiZ96SyW1PvbIZAlDd54EazxbGtBPeCTO+EX/Lsr36Lz5zvwSfHpWqy8PGijz5Ppv63V0PrmcAWh8eaLbM/Sb5jf5kOZs8jafg2v5trSIKozW/QQRTpOIseGdqDbjxfwBjJBXI6Jb7P6rwxDbDa22zyyEXnrJ9FgPqimAhhD0emjvaeeStEBh6teKjYkJ6LsYK+s81K/0vcr2bZuOylE/Hw7pD3v/O4PmfXTvhhMMBDIXJa+2mpCNomh0kgQYJnQ== 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=1XGrUsx0tMcN4hQa0nb9auuJRHrmZ6FkMU9jC4cGWPg=; b=bFxhjfC+H7eAVEonHyNXdcSiV8owvELbSytxbDm9oeMw4Sz1JN/odpGl603WCZIozmMtzQwJIxLTmcDvML0wn9L/iC3GYfHRHWvd6BMHOTJ/uN/JcIIClRH/zmlipzdKSJfZbqO0TEt3+A3F06djhT3gzkPU5cTIMhkHp743D1w= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by SA1PR10MB6592.namprd10.prod.outlook.com (2603:10b6:806:2be::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.50; Thu, 18 Apr 2024 07:09:43 +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.7472.037; Thu, 18 Apr 2024 07:09:43 +0000 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: Anand Jain , Josef Bacik Subject: [PATCH v2 02/11] btrfs: btrfs_write_marked_extents rename werr and err to ret Date: Thu, 18 Apr 2024 15:08:34 +0800 Message-ID: <5ad8b149fbf1f24b3610fc129b24b85196213ec4.1713370756.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: SGXP274CA0024.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::36) 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_|SA1PR10MB6592:EE_ X-MS-Office365-Filtering-Correlation-Id: 8fde56be-d265-4509-4eac-08dc5f768575 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ynkEHDX9/RjUVmjyjOS6x7OXzAmcZftau46s36M7IzQfovynMvKPMsyiioazjEQJ9VU3tckhveQmjVDcZNALf0uu9nq6QPlFk7+W1E44PoHtPd0nM8RSAJTiiO4Ku8zWLDpqP6RMkiOBj/2WYH6gfGeSO262zkXee5Ze9wdYg4CNEubdwmKG7YEJ7NjItLAKPmsAWMo4KIdmGhLDKPvDfKoKGAXc/noyUDVmmqruB/xoBhDj+kevDpA2ThbgfGvW+JemVRKVwmxfDG9ekEz4tuLe9dh8uoEu9nqDSXmIOcwSvo2/DPxadTb2QKt3TF7EC/jI7lZ2MP7GdRVwLMrDcCSqgF4Itn9oA956bMYHUMFJlWj/TrCmBDwFgkvaDi4DppwAq4F0NR6MFY2naswB/Ha3fMlG6ECbJ4JgbiVj+XGjAHGVnHlZvZUqCUKeeGiqRzT8XfH5cjt4mmW7xXs3vmFPPsWDPeiA68Wr31PPdf26KsX+8n7dOz5XZX1qfLB1E8w/aJJHFtRqkQNMk0sGryipsxBmOuxiH2QSomhXrfRJrJqwXWLovRwCyqtxfDwTbwPGAY46VDeReOrA2Jg3da2++737XFkyQBVP/BiH43FEUoAxpwmOQU3lhMrhynSmvUCy5HWvoYXmkZMIPdhoyiCayo+jwJ4rmU9CPUZyn+0= 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)(366007)(1800799015)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qvOjgKGbNpzQZUBOyNWc4P8FpCBs4YPwWVhaVuLL9Zm9Qi98qrfDULJ+aLxY01L79dileMUKJL2ASx6SSxicjsp4BAGS/zpAOLnAIGCb6ib3OGQQFTu50EzjtG7RXghJGR9zxOSmvw5x3UVmFd9+yP1l+Hm3uPytpZci4xbcRua2+CppIcFBJSZ6H3lILz2kfMKKNeOpbyXgcnhCSCo9wmydycvquY62kLq2pftkESC22NER8gxpgWy9w++N5gzMRwBaXhocpgAzu22evtug2/7Px+s808moPZ4J2H98SyjbkREPYC6JNHhdnqq1Ipv/9uUMkE2hHSVDqv/5R/xnA/5aRiaH3xtCdmyeF2OhfNoNEoQKhs7eioSPomB8JESRB7Gp2Xm8utXhPqHb+j9LHgAlUdjv3g5iACnurW8h6sHF9paAyiudMbCMQe2i5+P8Z4MA97/aKs2ovTcl/Amull/KZVTVB+HV9e2LuyEentF25gKMyJP2a1Yc5UinI1qlsAsfG9D+gioIZ2SsE4cE8tExm4xyfiRn/7jDdCN2DuE6NVlSW2c+NwWqPoU+f0T+mqyFWqGJQIIOwegMiCpnzRngbNUyzV6uOZMuwdWtrc/Gv6oKqVvVOYwvG0/f18BSqSVBhCY8m4c9TMI3sGPxzyb616Aq8uqNei1NmwxTGlto00f73uj9cVM/6/tkkCnwLl5F+hoEYEjUYm6ZxYbbUyrGAkqAT7/KgFJf7HD9ZWAl/9pf63DV5d3yJ5sDbYOI+9lTbYTvBL2xoTyFvo90MGFbL5g0qaBtzkMLMBNmiX/aXj0SlsiiROeLMe14VfJaIXNviebqDvEJ5P98F/8xHHexSQNZ1ds+udBKy+XcGPr+orM10gjgVD7cpo7XoyzuoojOpEQ7X+uj9zgM0UjpDdm1us4px0Dp4RJvg+XTYmHYCCJ7F/EtHB+5k7N1I27fri50NA7LXpRDtHgf5/Bug0s5c7U0Td05OlaoUzDHDalReAat/6i3GUdUndrMxEvaMOUQQJAptAuabUZFdRsKCRrvvanAj25HrrVpR8qtfYxcxarkg+XEdzSra7a0o07yCzA4bQISDpAw+p1k35Af4rrKPoY9U663qPc1poBZCnlPJ+3+oMmY8VEFdC8u5uNYkEaaw//xM1TDuZO1fUmXsPzA55juqZlLs0lwGeEefbBw6bK9HlCFOSvQ5QgjBi7MRVv7DB/NKYib4TzHqLHT8m9bmytPp483MqyIm/o0KQzKyJ3Gdx0WWnYIQERLLEKMup0XbiBdLEULdEQqgLaNOikYT5vTDcu2Wmnt3CzhMkI5Jbznw1sgCveytfl9s5jmlrZD204JowRht0AdXKKMfMrH5VQ4y3Z/i5/dCIJqtsYWiiu+Pn2DifJKu+G/n+r8CKU96POOZgagBuiHuM3DySfbSp7Gq0Fhvzufjqk5npTk2MbIofBnVkJOPkq9XHfDSo7C40boeSBiWwL5DYr3xjmVZyV6DjdhNjXCs0LUmD8EM3y/EK03SFbejDelc5hy3TEkHh+DvcvpSyn4Y+GFjssRJ10GXRkAalot2OcABBJ3TNAx4it2d7pcF0Ui8VnI X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 1I0YNpYcrITcO8aUqjS/i8hl+CxooUc2VpRPXPvTzFcbxn3H3fBbfL1NyUfaasx6lujkHg7yOjOjvyE9JNIgZWmuwZYR18T9oHwyAGa1uWZS1op+uJnJSZAto2VwJm8mVlLoPy+zHhnWOl4ln5SZykuheGXxpCCuUKoUUsJcyVJOHrD/rs62XAURMzOaAgF10bNGZXKbkD4kkEwICiGQgPuSRt/dfNHOprOT50dbW2LbRXfXkxFy+iOpejU+mr9jjaSy3ZCK42R8dAbROMrYbDQvuH4/KXFzpOHTQnESzdP75KA2NBInrPEWxUut/PLIfLL24L5zFjh1P1GPbA7V0Qsb+P7zS4KA1wczEFeXtGZOZzziYfmkEWQTn+wmsv7HAG1Vr4UVKTPI4BXHnMW6/QDbPT9Fv0sA3PVSgLNB6jKty18xxvcn8Y2VLkrR5rf4m86+iusmDzfXjT7oUbV18kX8ijkrJg/jU4LQhqztU+oNcL1opKRUnYrADPJb4l2fMFXYI7mAiuUwUzSROtMyCUgvRfJdRCCbtBzFTLBKnLxS0ZF2k76i4EKssnfN12hnyk/+Nx83qXZP6tfd/OwdnwhmVeBTHCnAKRb1Ww19+a4= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8fde56be-d265-4509-4eac-08dc5f768575 X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 07:09:43.2260 (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: cspWheoznzRspPs4ikxcfNMVoaNswG4DxHRScN4tFhyNJk8Ibhrppvt3tE4GoX5nLs8laDuJvNAz32BHy5PIKw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6592 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-04-18_05,2024-04-17_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 spamscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 malwarescore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404180049 X-Proofpoint-ORIG-GUID: mMemNI1n97DyDQ1gSxj16V6L6szPFcLf X-Proofpoint-GUID: mMemNI1n97DyDQ1gSxj16V6L6szPFcLf Rename the function's local variable werr and err to ret. Signed-off-by: Anand Jain Reviewed-by: Josef Bacik --- v2: On top of the patch [PATCH v2] btrfs: report filemap_fdata_range error Just one variable 'ret' for the return error code. fs/btrfs/transaction.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 8c3b3cda1390..defdb0979d68 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -1118,8 +1118,7 @@ int btrfs_end_transaction_throttle(struct btrfs_trans_handle *trans) int btrfs_write_marked_extents(struct btrfs_fs_info *fs_info, struct extent_io_tree *dirty_pages, int mark) { - int err = 0; - int werr = 0; + int ret = 0; struct address_space *mapping = fs_info->btree_inode->i_mapping; struct extent_state *cached_state = NULL; u64 start = 0; @@ -1129,7 +1128,7 @@ int btrfs_write_marked_extents(struct btrfs_fs_info *fs_info, mark, &cached_state)) { bool wait_writeback = false; - err = convert_extent_bit(dirty_pages, start, end, + ret = convert_extent_bit(dirty_pages, start, end, EXTENT_NEED_WAIT, mark, &cached_state); /* @@ -1145,24 +1144,22 @@ int btrfs_write_marked_extents(struct btrfs_fs_info *fs_info, * We cleanup any entries left in the io tree when committing * the transaction (through extent_io_tree_release()). */ - if (err == -ENOMEM) { - err = 0; + if (ret == -ENOMEM) { + ret = 0; wait_writeback = true; } - if (!err) - err = filemap_fdatawrite_range(mapping, start, end); - if (err) - werr = err; - else if (wait_writeback) - werr = filemap_fdatawait_range(mapping, start, end); + if (!ret) + ret = filemap_fdatawrite_range(mapping, start, end); + if (!ret && wait_writeback) + ret = filemap_fdatawait_range(mapping, start, end); free_extent_state(cached_state); - if (werr) + if (ret) break; cached_state = NULL; cond_resched(); start = end + 1; } - return werr; + return ret; } /* From patchwork Thu Apr 18 07:08:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13634231 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 5CAB93E493 for ; Thu, 18 Apr 2024 07:09:51 +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=1713424192; cv=fail; b=pOzW/DvjgM1TEN0rl3qHh44N+OsRs8hpl6Dwp/Fl+9XrZRCZLBrG9BpaqNTbfVDyvVGrcfzFGpBOe8Gu8SA5+dL3oI5M1Lgre1VfWHO/xxnAWe13gJfYZX6hZSdnFJgNhWtkyEi+3I/7JzJ+goXhh3fcbzCb/tO0P8Qsnw7+psY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713424192; c=relaxed/simple; bh=iCxPxjx6WbhEt/kJ49GcIsd4dvkmewvBqWW3rK2GMGI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Sopl3CY6xG8tyluoqnaEVel2QoxqCv+LO9NceG6wOxCR937GkCMVl/6Xwv7oM+NcTK7WQViJMfXZEVTt1IH8qveD7ztNgpWK6RHlaYOOoSIaHoFfqz3x8Lmr2WWjjVQ+2Z87tndRQHW/VZzZtP34406Hlfc8GfGGXVPZHU/19ec= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=LAW+j6TI; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=XzrMdUAz; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="LAW+j6TI"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="XzrMdUAz" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 43I3xlFQ009835 for ; Thu, 18 Apr 2024 07:09:50 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=5rKhOAScfUenhDnNJfNREtpAWCWmAlBjkacVOjH8iRc=; b=LAW+j6TIhzSiCAqnUhU/7vVeO+v6+mbXs6QrUyY+HqKraK+a3oouMYXVl3tPOQjxPuIm TgNQoW3zvhJx8Oq917SuUjJwEfjgeb+/6/vrwve4vVSYsnZHGeeK8j36VxmUOePwOpGd tbdwaBK13wEKxoFGE/00RVrGae4vF/zx2o/LuQy2f3ISH6RBYfCgTdhqoU6VZN4Jbyfu 0HgLpoqTvzkaZgmNLSr4NLwOv1mFcww3+3mPX4Qi/SjEkENFGfPEe9ebqjBfrrOUw18O H72VaQYC6rgwNAztXb7jd0LUNoF7zaue8idHK418fJPt11g4FJ66zwpQr/EcYfltkSvE Jg== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xfhxbshf6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Apr 2024 07:09:50 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 43I5xiMQ028824 for ; Thu, 18 Apr 2024 07:09:49 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2041.outbound.protection.outlook.com [104.47.66.41]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3xfgg9y78x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Apr 2024 07:09:49 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lSOthgY+CpxX6T0dywwrUfCdguF2AMr9oRGXe0oXYAFVw6UGH9itsq/4UaNy+AOX55EWB9XyGcHkyrLCxP5myfzQVlINTlDUBhChGCd4A9Njx7RhAwANCbV3ECb/9KThkOaqOUbx6bj9+LnqGPafDFdRBTyPYwtnJAPfAhp8GG3vzO314qk/TTMvyK7IPN1VdDrrq4XfowqniMRMVxMIezBYgMV8X0U2+HJLwiescrntOrAVbvO5+0HlxQeEi4y1Je5vYD+rpSrDsnDNMnSYXaAoI8Z7G9E0xG0xle+1XHM2pdceKvK2hQVp9Vmx2Oj2Tf6ty7r1rZ7y6QLq3jc5Vw== 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=5rKhOAScfUenhDnNJfNREtpAWCWmAlBjkacVOjH8iRc=; b=N5//lyR2zc2MvY5wGl3SpDH45SPTHEtW/1Sp6rYNTncdLunA/Hakl4oa4iX2vZ0cZKT97RNFv7x4TLsuajQ6+IZQumMWfzc0Cj1u5oK8z5oIUCZKM6Y/vz9jfhuxoLNUWYGbSfweYkn8gt92tcVAM+IqzQ67Dkd/xheZXotd7oRed0eqr6M1IItTod3m0+vNsdMsXxlg2VTW9QK5tAwWi6eESQJym/SGQ/MYXbC8ru2+Catz/3lmubkbR3Ge5Sw3c2NLMs1exQkxd0VPyf/P3WDR9hhRgu6gUbTqry9OUChDpcutHw02Bc9sOOy0+pAm021fziQhLxmjz3fjwrk6kA== 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=5rKhOAScfUenhDnNJfNREtpAWCWmAlBjkacVOjH8iRc=; b=XzrMdUAzz6uDLDBBbLSjEtupbHhQP8+aOJnug7YUP6OeZMKCKQAqXRTu+htYhTAnD6boakoMMgEXK/74C20305J0iajU+cy0mPUW6dz6o3ZtejwGCKMgKFrJvjxxsRV+6J07DVgTFygA+6C0dTt7JuuY5qz1Ogi3kUflpv8SuBY= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by SA1PR10MB6592.namprd10.prod.outlook.com (2603:10b6:806:2be::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.50; Thu, 18 Apr 2024 07:09:47 +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.7472.037; Thu, 18 Apr 2024 07:09:47 +0000 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: Anand Jain Subject: [PATCH v2 03/11] btrfs: __btrfs_wait_marked_extents rename werr and err to ret Date: Thu, 18 Apr 2024 15:08:35 +0800 Message-ID: <15a7979ea28fb0cd52c09969a3cd0ea4582787d7.1713370756.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: SGXP274CA0008.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::20) 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_|SA1PR10MB6592:EE_ X-MS-Office365-Filtering-Correlation-Id: e261ed31-d71d-465a-a3f5-08dc5f768802 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5zItTaZgnjLrMwEm03874v0u9dbnNi4xy2osSDfbZxRtUDUSN6U+B7DMteRxTzHurZ7/P5IVmXoAFhdok917gduDfGq48iLdcOtz0RONAzz0KFwmZ520yzFH+OIpOrTuwcr2BQgb6elT21C2coJpda7DaXhdSV0DNmWi9Cs0sWiBF3GGwKkSxxttTRAycJJGsjTBuaN/rnszZsGsFYqFxgUu6DXGNXsHEZHXo/FMdldOar3AbsCk8vYSYwQ3Fb/dFw0rQwTz5H1ocfrwdo1rm/4Kr3R0vWOoxDWCI/7yTzn6MiyFjj5ANFdUSouXKHU/EptR42RNebiHNIW+4nWqKKgGeNnkj20k/2lZBtbe85WQ7bm+zJpsunS8IUNJubBvn4abxhbIs8T0gtFa0jkK54QbRdPngcvpb8SYp8hz9U13Hz/8K9pVfEbtk9HeftwcJd3WIYUzBHSMBZk5ZRq1JJxZk4t/Oe1HjS/FsueEgWWpik4i4Z48+kCoznipJM7iqnRfYiGEyVUpIDuqIIFHeGzST1ogXdjQrew8D54zWXj8310Delg1bQMVK32eZOc7gYngPAAWktEi/6G1FNA4bntw7ATM8VJdGlcHRKHS165oXNJp57brxjM1/h97C85g/NALbs9dEUr6iCrexLHSsb3bChmJZm5MPLgM7X4Tyho= 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)(366007)(1800799015)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VBbl6HTh7O/NxGhLGyE+3zK8vbIaYR3FKbOiaLW3cgzXPYclS48q78lHF+HbtUVylOhGL2FddLJsnk+ZfwmIOYbqWV4gD5FG7E8jPg50ZDOHgEvqqBpIYiaxWehM6jEy90/7uBYokkEX3eHgXgNi7q6b/CjCCGxPM975LuUAWSQbhg2jpdb2aOyFF0VVxiC32YDhu6DYgl5JQAme778IqLMRt62Y1PQXG6kRQdJXWJevIwQH/6NhHjvTgB81FaPVvLkv/A5hBj5JfXbcMJGvZcH/1ipJ8cKQmOOFctEiq8dslasMb9ox1IkKOm74p+Aw4+qhCEDU1EreKfk3PH1R0MPwTHzGqp+LtIzL8gSXXZRK3iO18LligM7APOOK6m9x6H1TrWTQWy25K6Q78OtLXBEk+OKlMnJeuov75E7EdZDXLvAXjAJgsSL0QEINZhf75U3MGsIKrHxaS5jOmex0f7hQD21OAveoovoqt2IvLOJzHokVjDa59XguTrRguG1abrf/tn+JHPMNgjiIlUD2H6Ht6h1/YRRyJs5XOw6is46wehTCS3HuCsYlEMKNrYa2BmKEsZvUXW+UbcDpRJnRAozcepHZnQNOt9L6hTIueOp3KPipMU3XVxwKhZ30Toaye+P+i/RzANmS8X61aX7uE6JdC/wtjAf8R7h3aNp450jaNFcc+cg7QXiISHnZsYsRFym1Ode8P0y33aU6UFUh3IXTiXl5wEg8hy8uo/n74CiO4SxMebUnTp4WR7vwi1XuECkdHUWpq3cBcZ7IBU794bGRyKDsYl6xL2BJczs4gb0JX3pwDkySnM213/Jwi48WWSbLDx/sTi6mpsglKletbhXBA3EEJjLD1/tkgGT3vt7O3xo7F1T6J5M5sSd5cpFrckqeh4M3tG2zG7sayPRO/92yVRD4SFxJ9cqUCox1WcflV4TeQ9A1fcmIvibkE0PjlRdcQBjLKb2CODNE2wK4zn0n+EH9HfitsfGQmf84pBG0NIvhD/2keEfhbKvN6t53UqDuy5dHiooL0xE7GnaMBo64gO2ibJfocpLw64YLCBNtfCnvbj4f6fxHXfdaL1Bu0ngREe4BqVVnzgIMB7jY15ZJ1qLrU4vdGFCpNDSuvlJKVTkvn/7s8ir0aF9k4wNbhLLDiKykKjUfe1XgRzSGFzpPXI143CxoBSn5loFG2DS9/mvCNm/RejpHWkL2dTA/0/BZ93v6ThTiAHaiTMLn9EPahNDw8Dj1JGpa40XrXr7yt3UGoG7cbiYbMNDT5a91k6ODfsY2DfFLdMjnqj1JNmeG/RmYYdKg12pIBLLR/vp7ilHDX/6Vuyca529V6qwW9lskeDk6A4a8iKPqNYCWtof0EVKa8U4F2zVkW4BjrokxcbDrvYSflF8MB4c1RIvmXAYjgDaaW9mW3aY9Lt55EwID9u33NgyfKKq0vpUW1R1TWx84N1EAZBtEzfodahQZhkyouefSO/MTjKIsI+UpKlZAxHOgzVB3aYNFFK9QovmnKV0uQxQ6TNVhaS+O0tVNMRAVBUC8X+vbN6OV8JghAPjBoV1bUzfcX8jSc64UbKFLj6RXidciyFcXlby6L5Hv X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: /kyRInxe75tv8ycwc1Yt8IILLiAtO7OBWQh5zSJkKYNL5TAJNbK+pfDJlYOsFPzpeRKPdP5eVzk+yOFbTkZoF1d6CERcY6o5cMFuuY/OEEHGpLctNFiS/vZLV41DffpWaJH0TXMPFy+tnLjz/RJ/wCxYqJoaOUWcsyrvVWTeEnYDXA2zjKmobkq+DBAO8KCuOR0nbakU3AHjhABpBM3kJvSl28DJ+8ruuMGl1e3HASOU4n7AeOEOVnRkrwT8oQbx6iPGQstaiRYW9hxCs+gkpCLZMdfu6S41CHyb95BGdbYNjt1CNMhyzG+Zaz3Rdv/4CKNzaL/UUhStcY7i5X6HY8L4JVltdxoNiaJ3SW0GVGascAiD2dzuTG3zeDkO0dv8J8qzXfCD6jnv2DmYytXV0yAPwZmakYM3PBsLIzLFbPqDc0orLp1vz+7DgfbXtkstnFJsj0Q4BtiYkY8/eDt1KgNGsWOMmcgT67ptUwNmTYG9urBT7bHLtXjmY4rGJPjIF9Uv61yEDREvUyU6ILTb+cwqF+hkwHIrG42k52IxjBnD2A/fHuASTQLyEy5a6z9NkyysLkhZXuyNPYuIlsQPw2W1hvgd5kPBsy+o2XQf3Qw= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e261ed31-d71d-465a-a3f5-08dc5f768802 X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 07:09:47.5240 (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: ABc2OQrj7qUWWt4KmeagHz9TY4EPjOwYaPcc1k8P47Cy/aAkO/LUjJfr8mx0xfSSqpTF5VUCIzUXMWKoJbsqLw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6592 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-04-18_05,2024-04-17_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 mlxlogscore=999 mlxscore=0 adultscore=0 phishscore=0 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404180049 X-Proofpoint-ORIG-GUID: 5Sk8vJGOtaZbdTkm6Fnor5XGjL_iu-Q- X-Proofpoint-GUID: 5Sk8vJGOtaZbdTkm6Fnor5XGjL_iu-Q- Rename the function's local return variables err and werr to ret. Also, align the variable declarations with the other declarations in the function for better function space alignment. Signed-off-by: Anand Jain --- v2: On top of the patch: [PATCH v2] btrfs: report filemap_fdata_range error Single return value 'ret' will suffice. fs/btrfs/transaction.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index defdb0979d68..3388c836b9a5 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -1171,12 +1171,11 @@ int btrfs_write_marked_extents(struct btrfs_fs_info *fs_info, static int __btrfs_wait_marked_extents(struct btrfs_fs_info *fs_info, struct extent_io_tree *dirty_pages) { - int err = 0; - int werr = 0; struct address_space *mapping = fs_info->btree_inode->i_mapping; struct extent_state *cached_state = NULL; u64 start = 0; u64 end; + int ret = 0; while (find_first_extent_bit(dirty_pages, start, &start, &end, EXTENT_NEED_WAIT, &cached_state)) { @@ -1188,24 +1187,20 @@ static int __btrfs_wait_marked_extents(struct btrfs_fs_info *fs_info, * concurrently - we do it only at transaction commit time when * it's safe to do it (through extent_io_tree_release()). */ - err = clear_extent_bit(dirty_pages, start, end, + ret = clear_extent_bit(dirty_pages, start, end, EXTENT_NEED_WAIT, &cached_state); - if (err == -ENOMEM) - err = 0; - if (!err) - err = filemap_fdatawait_range(mapping, start, end); - if (err) - werr = err; + if (ret == -ENOMEM) + ret = 0; + if (!ret) + ret = filemap_fdatawait_range(mapping, start, end); free_extent_state(cached_state); - if (werr) + if (ret) break; cached_state = NULL; cond_resched(); start = end + 1; } - if (err) - werr = err; - return werr; + return ret; } static int btrfs_wait_extents(struct btrfs_fs_info *fs_info, From patchwork Thu Apr 18 07:08:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13634232 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 399613A8EF for ; Thu, 18 Apr 2024 07:09: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=1713424197; cv=fail; b=QttrDqQMsWy/VYjEduKyrH2RF6Jnc+YZrZWFFuVut+jrvV1n/LXyjvDUlZIsQvsShQK/ZsRas47KBdO+C38sxe2CzT5qISCln0HEU9uizfnRUn5n8e2p1hvr4SZGpHgmW3115AIrSTQ7zQ36KPFaBhyy19XDhlEaMkWenpo0zs8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713424197; c=relaxed/simple; bh=rA5m+NBPOATF7Mv7x5n8lbIRqj2ApMjG6+TjwBLP4co=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=qXM6Eazlm1Wb3P7+3ZyvnJaCVaNG80JFeLxewSLkHa4c0dRJtWohJ9IGjw6Z7cjWPIqKCGKae3/TKwx0+o2dUDt5pK0r3C3dBmXbJRbVrEWxQYCt9+zR5LJ0CVaFSeQdBbLA6k64kX4pll6bWwiQDwf5vP88t3p85GHsFSQPsOs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=gmkRxKi8; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=K05riQyf; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="gmkRxKi8"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="K05riQyf" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 43I3xXZM009757 for ; Thu, 18 Apr 2024 07:09:55 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=4KLa+tl+IaYSoMcUBxtRMDD90MahzhbzIu8AqicHbPE=; b=gmkRxKi8LlGj7Xv9RGPbrMA6B+Ke6u0xYj0bv9gsSrzXC2OdIa9MKNojSsutgMbA8gqo CkelzM+XeUGCZE4hkVoI0l1IEwCPCrlutUxslBpsWBmS/1zSqCOBCPNV4RAKSsOhzF7x di6dpDDzLyo8ckiZ9eS2ZKgQj9nHoHfgebAZIoE1hk3vBWAG8YHbTaEhWsQmdInbmP8n zpzFuC1JpM3E2+3zNfvxmAP58kXvUZ03QG3Fi6JwyiYWXZXhi+F6uurx/MViS7AgoYhD hhbpIvYtA9s4vn1PkfS8BnG9gHXY1Hymbl3nIdgzn3flJZdfXUuFi3g2bCE62MrwabTa zw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xfhxbshfa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Apr 2024 07:09:55 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 43I71PRT004349 for ; Thu, 18 Apr 2024 07:09:54 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3xfggg89g2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Apr 2024 07:09:54 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SWgWLKuxGsXD1MDNUjjm15djDRwIFzr0ALgStgsHdZWNlPimczBG9XXmHycrqnLVPbIdnnl0n8KYOBy2F24Qd+mI//JLAClj2m1Ct7LYOCE4f07AfLFNTowJGUkKa/RTWDaVlNE9nEolOz+o/88cCWRCtSDhqSz7PQOL4jCBMvCauNsv5PMImYqKgn/ZRU8iM3UdIQFUgVJkbqsIjmba1oHGQ+shHfC4Ghp4VVXZkcpC3nXt7NbKBCo9xR4/aAsVpZDQLg+sITog6WYRzfxek5z/nWSbaCmHa1hexdSpbWD2/WBa8BwJRMWzGFHsiRPuiM+0Rl+R5ggf1ObJMeWbrw== 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=4KLa+tl+IaYSoMcUBxtRMDD90MahzhbzIu8AqicHbPE=; b=JqWFtDFj+m/8rySQLg5Gc79G/g9T63LKX81vT22Q0uVN61BUqtYrKVsMdeUb9yFO0ih9nmRCyNHd/Efho7Nfs2mRFYetQWBwc7cQ16cB186We3PvvaO4NH+6Zdw02sHoxUYg4DhPlwU5J2s1Zsr+mqJSYiyVRz9/ZK2gjtJW0CSElY/19VdyNNdbCowOrfcJxZ2qCrX/uT3mAsTXw7VyBLdTsA8NiwT2eYqhA0JCw3J8zKYRzyNyQYvS32JJZQZUjmJLB7i3Di2iBsl25tBOjj+RBWCBOG4sqaXSAQpNKVnri1nweuUvK0hgZFddH8NaNCedZfC/EDWPoEmS2BKnOA== 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=4KLa+tl+IaYSoMcUBxtRMDD90MahzhbzIu8AqicHbPE=; b=K05riQyfDpp6TBphbijomJa1MO35EcmAJDgnHfH8PFVtltQHp6AtA65kSKLT8n0Bz8s4ceP0pnMiGdQdE6yZxnirLi6E1dGtFUNKHQCbrHlXYsdV8lrAgmcWrNPPgqIXtSLW8XW8DGOov8cfLC4aJHCmBOBQeB4XqjbSQDFYV/E= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by SA1PR10MB6592.namprd10.prod.outlook.com (2603:10b6:806:2be::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.50; Thu, 18 Apr 2024 07:09:51 +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.7472.037; Thu, 18 Apr 2024 07:09:51 +0000 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: Anand Jain Subject: [PATCH v2 04/11] btrfs: build_backref_tree rename err and ret to ret Date: Thu, 18 Apr 2024 15:08:36 +0800 Message-ID: <172d0454803abb487a5c075ceeaec450a233694f.1713370757.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: SI1PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:1f6::14) 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_|SA1PR10MB6592:EE_ X-MS-Office365-Filtering-Correlation-Id: 06289db1-3acc-4025-fe2a-08dc5f768a6e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: F1p1OtE9ynPEOhLS6g5NUcoBsZCMBhnat7U+RHzltiUGfJUZU7qDfFTO0SLepOQ6oeJ0HKMz8h/QrQC/oE/rsFwFGGNhJcKZB3XjWvWh7JnAlmCpdEjHC/IhfXOVJpJIQzH/cQ+e4cDx6/gvzQswuID5fmfoGXv2ZVExLhPfeAFn3jhVqXVHUICj6l/+0b5tZCWFdk6znjXTbeV5E0oZiUN2S+A4OK207afrF5aDgJMoWXsK5ftD3ST3DEthxku5qMsO54vhCs1Z59D71FA6me22fSTWdpkpe7pVw4QVbJZB7shBiEMqrtRPVKFnylMOe817eNW2kkg3RgatV9xzO/52JPeloX5GPzUTgalpu+Jz+dP50926Jj1tTwiYtz8wSmKcoJvhjfnBXCrv8k/jGcUz07NzBa24LGnGR6aNtBEneDLUj+29zbG+vUV10sK64c7KD38aKcVCH5u7w86m0sHw1c+Z1GP4iCUPs46Pw75RUfLnPcf8oJgSYWbCHbzDIlBd16A4WeMP0J4dVEMHszlnYTPY5Wk51uPohafszGmc6y0OJIspq8LB9ON7aJnNVeelmh9ob8uiRfK+GqKBQ/qYAf0qnBo+A6eZuTlZFpNqAPR0sMAtwdjOcvWj8T5aMiRKOkivf8RXVRVNstmQtX5r86s1SYcmofceTB7QjB0= 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)(366007)(1800799015)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OoQanCcmPjMUKf2tE3MvPtr06t7r+Dx8NWIA3zBCs4yZleJP3eD8PyAOHGeqsawwX8mDpkXdu8E+Ir/TciI3nwi14MtQMrd6Sy30ZN3W4cHYdUoZv5AW4XBO3aRvuJlaVLqPsXQLyw5ahJSxnkfu9GFKn9PZjWOAV2AgnoQEeId9s4hPCeKL6JEgVwBTv2K+V3IHDmUo67dBqEox/zRevMGJGc96P8rryOrEcW+QWGpRjAgeK4IWgt12NQIIYbj6WZ/uVZ6EY1kze9nLLV5xAufT8cBmMGurnHq4JmuPemGa6IlLKDEN6t7k4pb5hLlb0hKMrNd8/BOqgqN6qFAN1nGG06c5VL+0R2XrOOLGJ32MwppmvzKfF4oBLYIqr4DLWRf7lWCkrxdxKJyzld27oQ+KU/5UQ02zAX7YnxLWN/sSAliNBhEWhdXS1WdZgFST+B5U8qUr9juLD8IC9XQfP3w5jcOcYPZ6HBaqC8XpV8zER0Xjrmb/D7bewxT8Y/u6N8HlFBNUi3PKnDcIGDzU4u4iTcLeU8fvm3U+4mvrj4RAqDwy3UhPp60TjfBSoa+NiRYOAbXLyaGAoufJvLKvCHnzAXnd0rIHKd8VYBtIiX/9x4veOOcDwel4cC55REMMDRzugpeIIvgB6bRI86vNNyYySS1vdlx5ASAuX8F0KiGcx3c5pGnEi5TSaossddawA2+lx0gP9vY/pCGBdNBnKEht0N+ib+0/GvcNoAFdPgKw+JZ0qCGVTIUn4YYuEjN+0Tc+/xgSrBtB8uC0TvykqHnM14sr9++Vw7OYbVND4LUFQtq6aO5xLIJzFdwNFoPxiAbc9ERV1DvRmjByJykRTSBzoEik76bipLSVD18AhC+csm1vamSHYPlHtrZBis135tB9dY5jKfdVuQ259JFR0E4tDaQrerc7Uetf6TOM3slxBKybSEmnNV2WCHe+AiLQdHJSuPnrX56lN4Z5mJMRI9INVHMifH+wK8yqSvH+cTd/uUkDlf0O+kgMiCIO15/RxrRfmpcdRI0vW4NHW1fi5nflJ9rrxLnyOgVEcFG17GI6+26kgqmErLfPz6Xy4sfnDMEdO3XBkY2Di+41khkU76i3WXoIBkNSy9NIEyMKQGMmKrYzn5fC9I/dOkpn3zSyJS/LvWrZ9AohWYCQgaCIDs6Nut6vYlEjA/qj+kLsJwtd4Ju3mfBOCqEMEZfgtQftugqKRuIXNmZMDnJJOCf7fRoj+vBv0DCz+50GlCnUxKW/9hsaViuxUulDfdgSjSp8x8SxnHnCgeioRofWe6MSibn0+nYb/yZjPAyedYBMZdaTjeU7EZ4ZA9qHfNN2ELPkdKp8w+Cpc1e2XR4U3WPDUdrpXb/SkwqT4TUCXqBHxOHolZGrV4pNzXlfhadGAHs13jozrP8Emfv3NQEJTRwztCKDl/BFZcWv0u6XkV8H0Wr72CiDGu6KgE2eafd0OrnC07qfNruFXrHGjBX7jRxVltwRhVvwG9tl8XMZaPCOaoQXXutqgJrimjIPzL/SYAW4gqXF48ZdboT2Mev+Xd4Pk79Y0KX28g2WsT4voJN2LblYvh1jb34p5anbniw+8PRm X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: GrPQ/tWg8DNjN8uXVANNdhnEQxQSpLNQTBlazgg/gkawWJvqyVaMwCfRYTFx6DSrj0y2Oo7rUXESRxNLJCxRjDTLRlJYl3rNihYlyj5jtSxSwYCvF6qF7876+Ifc/q9fOeDjGghNE7tLUWBdh6PW4wd9D9707nIT3H2lmEK2BYnv40kbg4P6MQVPd7s5zt5HZExlibQYgak4+YrL1/Jibm6i4NrbO/KfHnE3smA3b9yd1lcVxwy8P6reGHSs0Jrv5llBIF/J+tLaivM2lY9K2vGIs0Rn9tt5+7uTqpJfwno0WJs82Gg/wO4t6sRTIAcQCtmKT0Fem0Zvw0OOZ3xG/WgEU8buCaQMtygGKCQkFCTDJOGrIhkOZtM1rR4dA2/Lpx7Urzgf2AuxSgOylYWbagxgR/ozg028wImy4WEJtlsDXafru6kKmrMw3m2d4IixpatPDPtEuKHbL646uxNxVP8fAfSuzdrt9vUiEhkw1MrfT3dAEi5AWfGuB0GfSoCMxymRZUFzMkZZxE/TQutbrhoLhJQ7pQeA/Ruy1Gg4pQS8cgQP3s2brB5PVptZ5vjuBbh98k6wKEoLe5mKY8Zkkh7whGzjX1uKkqcb7cs++9M= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06289db1-3acc-4025-fe2a-08dc5f768a6e X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 07:09:51.6159 (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: E+5kVFynxvVTSXT/QYjKL471NFVoGCMbwC8c41TVFms1ooXGoIQRPrwr+xT/5vc4TxlRyPdgYCZSSoLMvQYBhw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6592 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-04-18_05,2024-04-17_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 adultscore=0 mlxlogscore=999 suspectscore=0 bulkscore=0 spamscore=0 mlxscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404180049 X-Proofpoint-ORIG-GUID: wBMD4uCc0SorRmgyGwMc4hc7dSUWcx3y X-Proofpoint-GUID: wBMD4uCc0SorRmgyGwMc4hc7dSUWcx3y Code sytle fix in the function build_backref_tree(). Drop the ret initialization 0, as we don't need it. Signed-off-by: Anand Jain --- v2: drop ret2 (Josef). fs/btrfs/relocation.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 7e7799b4560b..aef7d286252b 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -473,20 +473,19 @@ static noinline_for_stack struct btrfs_backref_node *build_backref_tree( struct btrfs_backref_node *node = NULL; struct btrfs_backref_edge *edge; int ret; - int err = 0; iter = btrfs_backref_iter_alloc(rc->extent_root->fs_info); if (!iter) return ERR_PTR(-ENOMEM); path = btrfs_alloc_path(); if (!path) { - err = -ENOMEM; + ret = -ENOMEM; goto out; } node = btrfs_backref_alloc_node(cache, bytenr, level); if (!node) { - err = -ENOMEM; + ret = -ENOMEM; goto out; } @@ -497,10 +496,9 @@ static noinline_for_stack struct btrfs_backref_node *build_backref_tree( do { ret = btrfs_backref_add_tree_node(trans, cache, path, iter, node_key, cur); - if (ret < 0) { - err = ret; + if (ret < 0) goto out; - } + edge = list_first_entry_or_null(&cache->pending_edge, struct btrfs_backref_edge, list[UPPER]); /* @@ -515,10 +513,8 @@ static noinline_for_stack struct btrfs_backref_node *build_backref_tree( /* Finish the upper linkage of newly added edges/nodes */ ret = btrfs_backref_finish_upper_links(cache, node); - if (ret < 0) { - err = ret; + if (ret < 0) goto out; - } if (handle_useless_nodes(rc, node)) node = NULL; @@ -526,9 +522,9 @@ static noinline_for_stack struct btrfs_backref_node *build_backref_tree( btrfs_free_path(iter->path); kfree(iter); btrfs_free_path(path); - if (err) { + if (ret) { btrfs_backref_error_cleanup(cache, node); - return ERR_PTR(err); + return ERR_PTR(ret); } ASSERT(!node || !node->detached); ASSERT(list_empty(&cache->useless_node) && From patchwork Thu Apr 18 07:08:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13634233 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.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 91A253A8EF for ; Thu, 18 Apr 2024 07:10:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713424202; cv=fail; b=oB/6qTcqB8ez92Qk9vC74h9T8oA94DFRc5rCOo3sgU4oImlnoZXEdh9XyjOUCAb5nOqsONYyymkwPFgmzQOJvKxicoNgcquV8WdG4rvJMKz2W1w8a9JUzxaLgLnNJo5qsoPv0uF3KTGz5tl6Eh2xd2btHOrj+JfMvVukR2cHxs8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713424202; c=relaxed/simple; bh=Qa0mtsFXCUQx4w2s+mmjQvw4j11fdEa+8J1vYD2NUgM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=gU8l+KNxdauW1+xkw7K+FM21bUWU3MgPSRriPT4WYnMQkVt3zVxXy9hQ95yKzVAiKk5sql0BDir89B99w22pXGPydFYmyauxoAb47uq2j+xbYx99qhU1Q9xSkFguCT/hVyHkwwHc4VoIda3GbuWUjCnqf1PgRHBY6l0pTAYFMoQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=NCJdhUJY; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=x4CNLtKj; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="NCJdhUJY"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="x4CNLtKj" Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 43I3xXtU005911 for ; Thu, 18 Apr 2024 07:09:59 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=qPy6SaV1UkU1D6B69YCD4nyxC/BjjKwSYf49BWdnttI=; b=NCJdhUJY2/5B1fFscQHop0wh9p+JE5wEr6clhnN74qV+nzPL2qMAdmw0lstyb1uX7p5D zNwHiuhGH3GAqHgQkCB783tsouRxgMiSFtYPS1ruZwb12J4BuRPc08d9H/iDpyDhZkOy oFl8NVShxyt94MMruwE0FXc1VAAKkI33YB+cm4ehJQX4m+Axu7pZcTlTe9JXiOZ3PMER ShW3DOP4K+UIlFzXAGXvDIH+4UsqJ00nXwRm0s9rOSNsTbLwBiJtdc761eustnZyPW+C oaLtu8TQOXisIiE9wo8MHf2GrsbSlC5XWCyV1uPS9WYT8/5tOvcgUwgyAane2Vuj5hnH 6g== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xfgujst61-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Apr 2024 07:09:59 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 43I68avF029348 for ; Thu, 18 Apr 2024 07:09:58 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2169.outbound.protection.outlook.com [104.47.57.169]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3xfgg9y8xt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Apr 2024 07:09:58 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=homPD0no3iO/Cv8FfKqNUP4+dpDyxmjCNgXBbr28sW8EnMSA0VriSbxdvFpMR6C+RSIURokcWjqfYTKM29Vmri/rBYP+0VOuao6/F2qQWs/Kf0R65Y/Vz8C0IUrsYuJnIVb+TOn35MfmI7xCMDClvmbE9yw216WwxnbvUHrqU0MBo18MoSaEmKLmZY5X4cLk5YF16FfqZPLxsJKa8qRScaLcubE6lEbOko5kXIgWNBPdvtWd2GLREK3vZc/lKoltZUx0rBlVbeCfqEFgIyfXWyyXwzmMzmIBuuA0oTn81XOeFWP46Ulif24aFTZ0tMmbYatM1Vm3tMIQaJGPCwfKYw== 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=qPy6SaV1UkU1D6B69YCD4nyxC/BjjKwSYf49BWdnttI=; b=ZReqCNbCYsVfsC16y8Jg3vvBXaqsosLUBj+uYozFKhJDuUBjhh3BaM3wAh6yxdkVO/SMUXsZswILQIk+2YpCuC0Lc537PnWqeEfn6mDhB/apsuCESLoqUATILlREQIt6EazW0j29m1taBQ9WekSXxX3ot+medMNnPv1LlLLfnVroj0kDbuYC+nSZgmu110xbDVjyyBgEQos2NO9BoasASA1lX9eSwYhtD7JGOO96IhhmSczB2j/1qq7pS3m/JRxAcVR4ifgTvkfPj+qkGtbHHnwu7jZrabWuGIt72fy0tbJf4weYzjKJXudktwU46w7xwkXoW+zO0DdxdCMwKFwPgw== 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=qPy6SaV1UkU1D6B69YCD4nyxC/BjjKwSYf49BWdnttI=; b=x4CNLtKjppmVdXwfIrWi8UVKCjUARxwv+PIDbds2e+RIjNOUqB1CblK3jfWuTwk6JZfuS4NNR/sZJsqFPVPwljH/V7gh2I8vwVcv40DVqx4wHU1sBoyv5Zb1znlQ91SmmIeB8thktvec1Zqpoj98MxMyoYU9w0ErOrSQ4aVUpwA= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by SA1PR10MB6592.namprd10.prod.outlook.com (2603:10b6:806:2be::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.50; Thu, 18 Apr 2024 07:09:56 +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.7472.037; Thu, 18 Apr 2024 07:09:56 +0000 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: Anand Jain Subject: [PATCH v2 05/11] btrfs: relocate_tree_blocks reuse ret instead of err Date: Thu, 18 Apr 2024 15:08:37 +0800 Message-ID: <3902d080e45e3feebf29cbbf7b50d66b47ad9de2.1713370757.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: SI1PR02CA0039.apcprd02.prod.outlook.com (2603:1096:4:1f6::9) 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_|SA1PR10MB6592:EE_ X-MS-Office365-Filtering-Correlation-Id: c9567c42-f622-4600-7722-08dc5f768d36 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l4EwjfbfnTP5KZ2D7PrSvwcPFoRpJK9gjoSOw08iJwtqd62Ck4a9bRxkf844rRdPVDrdneoer1SqNnDG4BNqvIVB9uynYPtIY+01eDf0M/NwNyt83HpOKUSQcTr/U1gVbu2gyxTg2+so6tt6gRoQ97LekTrRYF5QrxSRmc/50cLWPPcDUe0wr2vUgtPFNXtve0OTGgHpPLFn6QokGKsqLaiA78FRyOK7IMrx0Tb+KNFecPV/Pcfdtwb2FV+wYjKQFV67FWy3p+q3sA0rqt2NK7efbiPxRl6bD4h8ZHtV9Is7zbLxySwCvu+dxBSe+EttRtDzn4RTnMd4ioYJQRWf8qLKCAe2ZxDaZ0q+bIpaQ/W4axWz/tFK8gIa/YGDOLEKE7eiN3qRz8fr6ZYHgoIDgxT/eteUAQQSgukqFlTsR5I3RY7Asyk0GLGX2/LqDRCoaej5sX/ZVfuddPZyPv9hfhKEQc5yYyBfPI0YYiRZ4WAvURgjBnVptO5DAYuA2yodzde7gThRoXhoIn7m7pOZr0alNJyH7B8PyV2PieCK5gYtJsn73CZ12gsaB4s3KCRrn1Vb0SXKe6uttR+MftGYL/rPgFpPmwqnvDxlymkmtlpTvUvUB6wi7bmtNjs36V9ozJAnvE6UyxdnULkjzofQA+7DtZ/TI57OYe1j274G0WA= 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)(366007)(1800799015)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JW2zERk68mUztHRJbkCV6ftVtRFyekl+5jr8JnSpOg2loQi3zuhAdTH4Yhx7vZa42g6VWRDyNUrQLpF21gILdVQod2Tl9Y5cS+lcBoahneV5G1BIo9fk2AtrczBzM89PtY9/T1zv2jGHfKabOucORu1KHENiKBAgpfSgDe/jfb7lNL19Mf0QCXZzQE4WQJq42HDCQeVjmTcOlW2WZCNfS69paqLbPPU3YQpNrik747mdNN+3ZQ9akAYDYsCuarykQ4+lNz3B1OiwXkKowkm/jWdn5V7Qm+LWpysbR5F5faCUMse9j8UkA+PMkhway+YDugTK7SXIDwvIHLkVpKu11tTWWr/WJiY5OzfZkhQNf5qqMK9ZJqJdPZ6aMzpXdwORDOHuZR7JM8k3UDWE6Jdi5P0J/L+AEJ1CXkfMfEa5lc5ENGAcLAEkuKKslJX6wXhCp/pUyOSzS4Y+qNsScZ5V9yJkJ1Pi+uy7b3PPOp/Pca8CUDceAOSES9VnGonXA9hJmmO/kJsNyifjoI9YzOwIgFaOpPyCs+6q0hFuFgTUkT/ib3VtSp0ovL8wiEAaJHbLXT6bwVCOw4Aby19DnctDAIl5XD9Sa1lBUiMWFzD/XVS9tNfdo99NCn6hFwuTabpkij/9lzKZofpLjQ1r849+igl9p3sIcGR3ym7afYKlvnX8mPWiR2ynQU6GzqYVeIpzEqmMSCYKem7KJbB4JPm5RGk125WR/CklHsJkqQ8xkbHb4AeXDpcJhxB1AhZyYIYY9YIgCzZ9jjaigtv3iBlqkWxORyYux2kmiesNLEqLwHFa/nQQApgUaF56/Lp0EAHdoVQJvLsvKEGCtIIt/GVBwg71+FjYavThByukGS8uqxgm6Hx8qHXxTo9cezKHXP0WExraL5ECwhEC7ORGAcHk/Kh7Wg/d4PG3Xbl/76gSOShx3S6qPRUkMsesitndmoF+YVfLDlGaorhlSvCM+nmAaetwv9cHTrc0sPtBjJt4QnD/E5a+x5mG5kFXcT2yA7QZvn3tainTW8LTbcc3PZw+hm6t5WXU+mmZAIEc5vTtzgqOMw4dAO6fL2fECXlOv56xvttXiMYlWr4Sgnm0brzliH0mHVCNCpE0BWHlxVXHVri1DVe9siC0kDrmrhBaZR4+wBG/E5yXoRiXadQr1JjeeAlcC5cpe1MkEOm7BkmNQru1XY2flXYoLRhcGyRlFclw7uA8rktK5jWaKi0npASB5jn11SRe695DivJPzJoyml/aXfNRox2o3DMwQnhey9SG8sWySkb9VMp0hM7hyzKfFqJFnUyehL1JCojYoTUvQzcctX7Dh10KTtKLEsL796Y7mk+hzIwWmiFYS3bF6xWHWq9m9keHkqWntcui4UD8ZZT8U3O3Dkn4rlH592BIs4kKtd69SZEu0LjL70zhkhCd1cMnNqH3abbtRVt+4OC8ZoM0nkRrjx5ttMU0a8hHXMuN6/+KxwUeKljd7EougWIxO1yJVsojP8Pgiw8gZdxYB1iNAfVVtmo+uogkQuq11PItX8Fs3JpWpoRjz92cW+7aER1kJreroLkmyMkbbtX/3aEfgqu6gEZlBgiTii2yq39e X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 7CgbahSt9Z1eslSGt0pM/ybJHrZ6IIOdL3PZ61OSIhSShxO1GfaR0It/uVxLB9nb4tpUzm4VWX+BDeoNm3G08Cx0I0A3cBZEuP+cjmXVhOIxgg7hNQwbh5n01SqEP5z50rXfF8iswbKRph0Id4TgQ7Bduk2DbCUvjEqpkjPp/9pernkfAtfUaUhkIPJEFR07Uyz4UYtypZl1A0qmKS4hZj9ULnDNf6ZzN45qrWbp34rLMZnwIrIfQtaaVkKqfjkbwiwNVvYUym3Ajeq2nvxGnIMj7fqTBPaxihYVkpcsMIs1OuRfI/9EY6j3+ahu8XfqlWgGGV9LZ3KvLEVD/Xpa/lKke1u6Qt/xc+XVI69eG0S2xYo6KYDFsr5E9hj69L/HX4JjooGhNrII1sJVpK7WrO5c/5AvHbevVFIDnuFduZzcT8c3PMtowSETuRwLjinbN5lFcjj/krRs97/nFGtpu0wKJrtgBdeCLBNBnUdluZwhYKDdmXuzeYJeJUE5ahGGslLpY7T/5HP7cQW4Qv/r6SWGD/f94YiFVEKr2hP8syaeUm66TuhlY/j065RGpDzOEERs6E+5OVM6gwts/b/Rn0kNZSab/aI9DWypgyy2JgU= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9567c42-f622-4600-7722-08dc5f768d36 X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 07:09:56.2269 (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: JqB5mGoQ2rnv2Uapo6aHr4s4SFRQtaNDvsrVLIKjFnn2km2QnonwSlwfxCVCm5OxxQ+6R0EfXaOsXQgyWA9gGQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6592 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-04-18_05,2024-04-17_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 spamscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 malwarescore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404180049 X-Proofpoint-ORIG-GUID: tTS94KD_3SWhDwhi5KAMdfkJBkpl3wC_ X-Proofpoint-GUID: tTS94KD_3SWhDwhi5KAMdfkJBkpl3wC_ Coding style fixes the function relocate_tree_blocks(). After the fix, ret is the return value variable. Signed-off-by: Anand Jain --- v2: drop 'ret2' (Josef) fs/btrfs/relocation.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index aef7d286252b..bd573a0ec270 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -2742,12 +2742,11 @@ int relocate_tree_blocks(struct btrfs_trans_handle *trans, struct btrfs_path *path; struct tree_block *block; struct tree_block *next; - int ret; - int err = 0; + int ret = 0; path = btrfs_alloc_path(); if (!path) { - err = -ENOMEM; + ret = -ENOMEM; goto out_free_blocks; } @@ -2762,8 +2761,8 @@ int relocate_tree_blocks(struct btrfs_trans_handle *trans, /* Get first keys */ rbtree_postorder_for_each_entry_safe(block, next, blocks, rb_node) { if (!block->key_ready) { - err = get_tree_block_key(fs_info, block); - if (err) + ret = get_tree_block_key(fs_info, block); + if (ret) goto out_free_path; } } @@ -2773,25 +2772,23 @@ int relocate_tree_blocks(struct btrfs_trans_handle *trans, node = build_backref_tree(trans, rc, &block->key, block->level, block->bytenr); if (IS_ERR(node)) { - err = PTR_ERR(node); + ret = PTR_ERR(node); goto out; } ret = relocate_tree_block(trans, rc, node, &block->key, path); - if (ret < 0) { - err = ret; + if (ret < 0) break; - } } out: - err = finish_pending_nodes(trans, rc, path, err); + ret = finish_pending_nodes(trans, rc, path, ret); out_free_path: btrfs_free_path(path); out_free_blocks: free_block_list(blocks); - return err; + return ret; } static noinline_for_stack int prealloc_file_extent_cluster( From patchwork Thu Apr 18 07:08:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13634234 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.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 AE5F92D057 for ; Thu, 18 Apr 2024 07:10:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713424207; cv=fail; b=Rl0woL8E3D2AbfatAuK1aTZvXZw9Z5JoUsei7xLlF630Rvxd8gSmOzadKHzILn6HxlR5nIvmmegmmbDsfmA624bltLovGpBNcjbwq/QAyc2QleUIXrX8vsfCX7EZipzLABP/LoIyWkS2DLYlyqHuzMV/IooF6/tGzAZAigFG4uE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713424207; c=relaxed/simple; bh=Xn4lQm5DY9A43PJj7o5LGoy/UAOcr8+7KAdfnmxnKoc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=oZVb25K4EY+c8sON+AfYYGwU7kOP0ipCqRqceIbxD+uYUSDslUBm4JFBZHcz7q9tORKju1GvPPEYd9nI+9La4V+WFsl3JTUO84ljxa9H2zT7cTl+hsG1ijzxpGcO8equ2Z7cXpFWJhp9+DnWQsF7A97XVQfn1aacHpJbUMWs0Lw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=H1QYU6ag; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=q404jtoA; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="H1QYU6ag"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="q404jtoA" Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 43I3wvQt005098 for ; Thu, 18 Apr 2024 07:10:04 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=eI3jad3OFaud4fAUekZwXgBOAejc2iE4x+qKp+ZYsX8=; b=H1QYU6agHDbJu8cY3OUjSZUFPGI8LV1ESX1Gfnlw/4XnhDumFh81yyCb9lFeD6kMc8Wx hbW2zaUK3gRNcfsg3/AA07NeXOlD7c9/Lx6k3yRAWOLJaAmDaff3gBQNZ7VT0kc3/IWc UYyc9/F/OzKOeaJ0hmxQBj+mqsXKQ38oafeDX9t0xxW4S5JbsCmWWKHdjiEBE5STKTl8 bFiF/KG+aiaWvXythisba8XQ/QIuCd3iae873mpbg/Km3ipaHApDoFEd0NQ1YmkZjip5 Dp3iVBM0KM2lhyNxQEsOMm9u7VRyZrMRHTH8JAKE8H881HlZDu8EfyfqOZo69frQnoVa +A== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xfgujst6b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Apr 2024 07:10:04 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 43I646LV029200 for ; Thu, 18 Apr 2024 07:10:03 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2169.outbound.protection.outlook.com [104.47.57.169]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3xfgg9y91e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Apr 2024 07:10:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b3uoVjtRlKuhq2ckxSqaSsQjeuO8+tGYvZNsHjWZCUX7NCXsaIX4ecMA9bfdRFIzqogEheWYMw20ywZimCVjVYT8I3f0TDg6EV+6aGg+74gFFK3oCvhmoFcI36VRqaB85egEBF9Z4uaUroq2sUhTHpHAJPvOZSn5+4kDlNFx1QoQ53OYPqtToH4BGIwSrH7D7NBBgUiGUNm9G+yFS2MO76PHuWHUQ1Ux1cCfGR8NzeW5/01DszqvGKcCdFFkezGHM17u88ZFYL8/dxp0bojba4ShhlJ4O3OLB94GBmPQ9nFzVQ90uMVYBN3jlS9H7u46k/2IK22KhNqXGZQr3nkfcQ== 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=eI3jad3OFaud4fAUekZwXgBOAejc2iE4x+qKp+ZYsX8=; b=Lu35bhW5CpWb9mITo0ZZTKhuYTXdoSbGSUlyhGMMR9BfWc9s6gLex13dFOlY/+MfLni5jLqEuHyFKZQLHnQx4dCEPkYiVAnx2gFkwFa5J+9RJQytnDhtDbpKNO+AwiuMUfVgDWvsyq9wVRBsa9VSFL0Bbawny/3u7fIuQVq68UMyDS4jgdNTnkJCrAG+UEW8pfPwnGgwQ+8d5QbBM8d5BoC8oSeBHAZVRl0ZyBH6q43ucW/GXT9xkdocX73MbS5rcPeVTn0Sv3/SR8Mfh1+RF5TyWZusctMxmWc+qklhU+GWN7DwyXhxWFOsPcyh634Z/y3p7rQxvhDlbG7PjdwFUw== 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=eI3jad3OFaud4fAUekZwXgBOAejc2iE4x+qKp+ZYsX8=; b=q404jtoA7+Wj6tYGppid93lXj052zVw+LKS+OKl6JbFQ3Dkp5TryW10TU+Dg3OvOmQ+Mene9qQD8MXYdpp604/yjdtBpW7rM/fC1QhFD/mvcu9aRvEG6qSjSOdf9TLzQY+XHJWRgU7/cmdH94RIEf4SDGrlIOIry7+pgSPWyqkU= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by SA1PR10MB6592.namprd10.prod.outlook.com (2603:10b6:806:2be::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.50; Thu, 18 Apr 2024 07:10:01 +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.7472.037; Thu, 18 Apr 2024 07:10:01 +0000 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: Anand Jain Subject: [PATCH v2 06/11] btrfs: btrfs_recover_relocation rename ret to ret2 and err to ret Date: Thu, 18 Apr 2024 15:08:38 +0800 Message-ID: X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: SI1PR02CA0045.apcprd02.prod.outlook.com (2603:1096:4:1f6::16) 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_|SA1PR10MB6592:EE_ X-MS-Office365-Filtering-Correlation-Id: a7d56479-417d-4519-95f7-08dc5f769033 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ibh65gbbNsU8PNejsdlJ24VsUpFKv/mCnLKojIswdRNTKvF6cRRJ2HiQd2SOlNKnceMBIk1oYGEiA5qK/Mx4XDrKqH5nd6ZZDjMLJJIkU7kbblB6bmHU3cus9ko19iY2gQNPUg6+4/Ce9wcDZ1zj4Lfek2sTEfOX3/HkKV42JO3lWwFFOapbT89LxGDNCMwLYCkN+mq/TW2QXXUnp9uu7TeHjd8fmzRGefFJsyS+qoPgWJKwpS+6ezSjVhEsNdjNmWSbxdN4cCeh6jWze5RcRS2lC4dEsd2TIIG6l2Nf1NHlf+T1ohqlOuPOeZPa5NmsASD7mKlCzlnVPJ0LPjABJvNcUB48S/or1PiM/Hmxhd8SVzJvSq06OBFSWn66JKj+DKS2u0y1smFfqShYbpQNcCorbjOJKhDI+5W0bq28FCt/gYos+Et5pUp81w1/FZ7u27Gc+DvLgOmOBd7gqQ52m2ABtRnLiIgVkIem6Gj2ksPznH0hXmQ9z1MdUOFXgY6nO+rVnuzQMJJer9iiE4K304TeV8fmFx9WJq1yuw6pCIJCCPIrQKDLlq8rC+NwlmlfbMf3ZT5u0Tcqb/1EAGfWVt0uPdz4Yn8UAk6mi4ak2tyd7Ml5x+bQ0CYXilKhrYQVg89jAdiaREU1urAshZWyJi5IIjqaaixPle3/E/YPHV4= 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)(366007)(1800799015)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qHvHKl2eyl7QkGe8EP5X3NEdhB5Mn4FjMm3oEwIX1FQA0f+RuQMB78TP/Wt5Lybu1FknhOinLI34Rn4HEMqEqkF3XDkMztLgJyOWc2998z0ng+ykE9hasP2P62CUe3pS74Nfo2ie0YB/PlwzoUjt73e18rjouh9XNUV+oEMgPCjbNsbkDpWw3XQUqY6LS6a04L2MpMWkXoFDnjW0sqNXJyUE/Ejo2ia4PnFLjmUBqBS0dS/G6IB4vWkkGvIjG/6/B8Y9np/gWYcImIZOLmKv+pqtOdpzHJ4uNV3LOdna+LtXWiPwjTMWVBZ0HanOABuy0iJFl1gI7ZSfy31ZR7rIFaWibQw6AD/r6AXIYpALZQ1K9VTIzDFP/uvqixzhdjFvgUG/L/wJXK5qKTkKZCPjLPrHZXvsOV9ozavoiz1YwftDZ0fnukxq/qq3fQTgpV/KWJZsm2wIcNqzbX2AJPIzW194xCXRl12DnZtRekQF6dt8wOO7B429AbDzVUeKhwLin3eVC++gAy1veZXhqO7jrSIiVne7lmlfpxQ0vBDZdAgLmg4S5b8SiESi7Vg+26lYbHEYh27M32H1Arxt8Agu8mJ9NwXPPcPUaWL0AaBFtPZZ2QpVpc3xNWIsf7/GvYdqpSpFAXvd/AwLULSayH6If2VpMKjlOlP5DUYuk/pWgMePf9otUsh1PPQsYaPWwN8O13nbQBu7Zc8aff86WR0RAiZJsVzcPkUTgY9DfYG/5W4edN/YjSkoqnOronUclv00RCMbW61hVFoMiVipwWeuGaFQX6Lt6CUSzPpGJIgUD7VMTe4MhS0CFL124FQ3nIBVRl7/zfcWmwnJ+VlRb/yY7bKstXgrrIkV/JLestqKARbM8w7BBOBa9Tr6usKITJTpIyMI9vKPGqXm/joIRM+2UG3StTuR9PeoGjT4LWN6UzhDe8Yp4wWyTwLjmSybSGQo/6IeSKpM3e+msRJvNWjsGAxvkGDMuRXn9pMyN2/Aj6ZZLwKkpB6QD3iLsp0yEDC0HB2adPi4mDoDkDqHFpmFUOd1XbNXLs4RaKSrcUxDULzHAEuoMYApbM4DhFrIJjWFThRC9LGA0vuAbvuXW8EqFyEbWP5pHSURWA337kV6ddb9GbJBhND9OLEhQTb60tr6V1+gl4efN0BFUtZ4ZDW8Rc5negTVD1Qh4NVzqEsHmy0n0NC5mvxC7Yd24CLn1j5L10kIYoBjdDdKpPQahG+3FXry+UkFUCORIZkRNO9j76lRCq5rxxfh+Vyj4Pzwlm1U3BLdWPFhuZRy8NopZ75To+os/5PndvSPSwaloB89EgXanqaKCEb7PFiPKXY56C/TLRFP/AbzkNLfZN9yRZwTdRjEBUpEbXzsUKywq28hFBfFp/3x6u6JSqF0Vnlp3cpD9r90lElHC/g3Jufg7Fl+2MaBdN/DKl9iTBsRJfjSGoxx8Sky74VJ4aVebAzfCDwkoD46VKDJbi/wo/JCAWGugQffka+MLwOelB27RBBObu+3oJ4ChvHNxm1zcjuMaqh3jdFdym8CY5FDgfmvR2lwqMwbKzDS1qfAuxumZMFJRdL1eCxJ06/15Km7LhyfgXk7 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: F3mBGT1AqZDHqKYBWwfGzQvWMVyCCU+sWzmSFioaCqrfMlu6kKLR1o9z8UQlK3Nxm/+41bgtxd3ulT7d8VCO4Th1SU9OR3809FTGlE19TgxUM6TfIXuyWWyhX5T/Ii0Ubhy/mJ4S/vBzbUjgDjUf8+BUCESshCzzVjv5cqhQ5Z83uJyHYTRl+Z+nizRF086csUlNdzS7pclKmkLYYU2D8gEIFEJqIVlw/NN+NjU6aSAEdKMBu6O7TA42U0P4muVEYxAI/A2SNYYCGaMsLg0YDtgMUApXqEk2SgB9sdQD9Jgz4lvINVWM3hP7wBdNiTuCJgamC+8tQ7zYJzO3Z2V0p80Y7gMlZIIjFwZ4Moe5YJ5AxHgt7z20EesQ/VAJspdYl5FX6UQBwZjgpoVSX1kOiyA1GaNTzZ1HkDEljosBzji1mnTrPXNK9mtA4UtdTtSrQk7uXeUudMoN3zVMJntnQ8ldwCc2pLIat6z1zt7FfNu3vzUOSoiV+SOlDx+5UuVxOXp/EV0Mg/KUiBjA+ww9xSfZIU7mNnqL49LZQL8K+xdk4Wa2cxiru/7W+bTYxACT6LkNiO+hIXITwB7XO4JY/+/WMw4zrRzn9neV08j/6IY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7d56479-417d-4519-95f7-08dc5f769033 X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 07:10:01.2512 (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: 2wfhqburPt9zYQg7FY9WBqOA3vWqAm9XCsKckDdGKntJQTvXoMf3MB/elCC6X4HFh0/MiChqFHZH6aYOp9HDLA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6592 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-04-18_05,2024-04-17_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 spamscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 malwarescore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404180049 X-Proofpoint-ORIG-GUID: TZ3Es1mgt6wq2Py9L3pVoXXNCd4tSbQT X-Proofpoint-GUID: TZ3Es1mgt6wq2Py9L3pVoXXNCd4tSbQT Fix the code style for the return variable. First, rename ret to ret2, compile it, and then rename err to ret. This method of changing helped confirm that there are no instances of the old ret not renamed to ret2. Signed-off-by: Anand Jain --- v2: no change from v1 fs/btrfs/relocation.c | 64 +++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index bd573a0ec270..0b802d0c5a65 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -4222,8 +4222,8 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info) struct extent_buffer *leaf; struct reloc_control *rc = NULL; struct btrfs_trans_handle *trans; - int ret; - int err = 0; + int ret2; + int ret = 0; path = btrfs_alloc_path(); if (!path) @@ -4235,13 +4235,13 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info) key.offset = (u64)-1; while (1) { - ret = btrfs_search_slot(NULL, fs_info->tree_root, &key, + ret2 = btrfs_search_slot(NULL, fs_info->tree_root, &key, path, 0, 0); - if (ret < 0) { - err = ret; + if (ret2 < 0) { + ret = ret2; goto out; } - if (ret > 0) { + if (ret2 > 0) { if (path->slots[0] == 0) break; path->slots[0]--; @@ -4256,7 +4256,7 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info) reloc_root = btrfs_read_tree_root(fs_info->tree_root, &key); if (IS_ERR(reloc_root)) { - err = PTR_ERR(reloc_root); + ret = PTR_ERR(reloc_root); goto out; } @@ -4267,14 +4267,14 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info) fs_root = btrfs_get_fs_root(fs_info, reloc_root->root_key.offset, false); if (IS_ERR(fs_root)) { - ret = PTR_ERR(fs_root); - if (ret != -ENOENT) { - err = ret; + ret2 = PTR_ERR(fs_root); + if (ret2 != -ENOENT) { + ret = ret2; goto out; } - ret = mark_garbage_root(reloc_root); - if (ret < 0) { - err = ret; + ret2 = mark_garbage_root(reloc_root); + if (ret2 < 0) { + ret = ret2; goto out; } } else { @@ -4294,13 +4294,13 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info) rc = alloc_reloc_control(fs_info); if (!rc) { - err = -ENOMEM; + ret = -ENOMEM; goto out; } - ret = reloc_chunk_start(fs_info); - if (ret < 0) { - err = ret; + ret2 = reloc_chunk_start(fs_info); + if (ret2 < 0) { + ret = ret2; goto out_end; } @@ -4310,7 +4310,7 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info) trans = btrfs_join_transaction(rc->extent_root); if (IS_ERR(trans)) { - err = PTR_ERR(trans); + ret = PTR_ERR(trans); goto out_unset; } @@ -4330,15 +4330,15 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info) fs_root = btrfs_get_fs_root(fs_info, reloc_root->root_key.offset, false); if (IS_ERR(fs_root)) { - err = PTR_ERR(fs_root); + ret = PTR_ERR(fs_root); list_add_tail(&reloc_root->root_list, &reloc_roots); btrfs_end_transaction(trans); goto out_unset; } - err = __add_reloc_root(reloc_root); - ASSERT(err != -EEXIST); - if (err) { + ret = __add_reloc_root(reloc_root); + ASSERT(ret != -EEXIST); + if (ret) { list_add_tail(&reloc_root->root_list, &reloc_roots); btrfs_put_root(fs_root); btrfs_end_transaction(trans); @@ -4348,8 +4348,8 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info) btrfs_put_root(fs_root); } - err = btrfs_commit_transaction(trans); - if (err) + ret = btrfs_commit_transaction(trans); + if (ret) goto out_unset; merge_reloc_roots(rc); @@ -4358,14 +4358,14 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info) trans = btrfs_join_transaction(rc->extent_root); if (IS_ERR(trans)) { - err = PTR_ERR(trans); + ret = PTR_ERR(trans); goto out_clean; } - err = btrfs_commit_transaction(trans); + ret = btrfs_commit_transaction(trans); out_clean: - ret = clean_dirty_subvols(rc); - if (ret < 0 && !err) - err = ret; + ret2 = clean_dirty_subvols(rc); + if (ret2 < 0 && !ret) + ret = ret2; out_unset: unset_reloc_control(rc); out_end: @@ -4376,14 +4376,14 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info) btrfs_free_path(path); - if (err == 0) { + if (ret == 0) { /* cleanup orphan inode in data relocation tree */ fs_root = btrfs_grab_root(fs_info->data_reloc_root); ASSERT(fs_root); - err = btrfs_orphan_cleanup(fs_root); + ret = btrfs_orphan_cleanup(fs_root); btrfs_put_root(fs_root); } - return err; + return ret; } /* From patchwork Thu Apr 18 07:08:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13634235 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 C17A939FFD for ; Thu, 18 Apr 2024 07:10:14 +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=1713424216; cv=fail; b=p2FSgtdP6UmqYieD4fSm3p9B7YNl/v1NvZbhaEeP+dulm57YoRMbNkzos27ujRdDh+I2xVW8Rbxy+KDEp7QBdA0MwLEUvg/sHuZc2m4gx6QX4dv01YhNo0lktYJXhhONgUdmRirj9c/UacePDb78plcZDoODO/HfhkIRUGWHnKo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713424216; c=relaxed/simple; bh=PCg803RQ1XP67UEHfYNDL4nFDJ8AVnwpp2GUObO5A1c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=nxywSPVfmmMhf2WX3G1ddAVGyjyU5UFIpBI4HnKUEf7kxCFw9WXvVYbRV/GY0I2jjUPCj6BSKZu3jpIYnIe6OoG1+cd5u5A4EjXjXmKzfBAHh1uZRf6q78TeuSWTwCuSxACnC2cGhlyWhdTgwsads0dWTNj9+2C7wHyxhuj0tPI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=EbPi/80H; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=LkW5zA3f; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="EbPi/80H"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="LkW5zA3f" Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 43I3x1HA007679 for ; Thu, 18 Apr 2024 07:10:14 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=sA6urBG1YPy6+h4LMi3cOsCxy29/QDQR3R71KdMS1Gw=; b=EbPi/80HwH1rO2zEb8i2yAqK4nWvGSZf1X/enMjrUZD4XTzqS8mGp31jcr9bNRiUYrqJ jj5m3CZ0IdfePb05V0lF1eClMp0WFUV9IMdzyPoJe8KbcxBjlBb/XxOprjNFyKAsq8M9 7fRu/GoG5FUY0sX7LA6t8raufg+oedYD87Dz0YSscQ5EeVhocPus+7DwmfK1VnOWnZDN VWFtJoSUMUmjoIfR0zmRRgDfYFxsqrsCadUKwBJ8kn6YSAD/v4DLG8SwQ5L933ciRvM+ SV11IyygQNtAPrxWz9r6S4qF/qZ3GOEydlRcXQRCSDb4n0XmuL6O5puuHGigQaYnPajZ JA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xfgn2smts-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Apr 2024 07:10:13 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 43I6HG0O028852 for ; Thu, 18 Apr 2024 07:10:13 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3xfgg9y7ke-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Apr 2024 07:10:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NI50nJRcBAqwtUCUspRt7rtVEkgeKcDHPL3dunmWt+af2kGFWc40X9LO1gK7LsZFPEI2aHdUtVspy6Gy8xzcVvegfKT8oJxQBTSoroKGS9XS8eLQHpJ18AwzTjlBmfeOMskAUybEl02926fDKrLTHbKGXJrO/5lnFKkcieomidFH61Y7EJI8gtRvcWwpPhrH/lmE8Tql7qwRrNxRH51iEBh9pSJgnbZIL74Xy4LDItczjyAFZVrPSQViHa7MQq3LXZwkGvqWkVtoTlf1QDRvBne9wwklUphfCdJ368GsCisYOYLF+v1ViiJYVOJxPrIahalP3Hux1PmCd3M7yEF80A== 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=sA6urBG1YPy6+h4LMi3cOsCxy29/QDQR3R71KdMS1Gw=; b=K8enYxZGck3y33exbzgTL1elGq/9nucH/MJf2gkjpTz8WZgG+lMUi8qqj5jkxDX7p3b6hQo4geTZN0T4ydvrJzI4pX+7IZQq3pb177TD9ENp95QhJRjrrpAZ6wm1/Os2EPp6tEHVo+gNvDOz1ZkmfX/zzrMtTuK6gKK1cH/P+dRBCdDi48Eo8FucWozXaxMjdGtPmPuvRbAGMT3IPkesgpT8z5VKY7H1XRWtfVrCtdOrPqIQwmU7hcRMa1lvJtghLQVIA7+lknVS3BHajTUK8it18+Giyi5YLuaIT8XbteMTQHfFnNAjVXHmkqexAxZ97dt7aRxTwwADWdS8+93OAQ== 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=sA6urBG1YPy6+h4LMi3cOsCxy29/QDQR3R71KdMS1Gw=; b=LkW5zA3fPIvb3pDFl9WN/fAynfv6VHqZzmnyzVgpBOiBBLiVkJQ3GF9hJz6vwJFwYV7j1Hz0tbVsEVK7ePnij64pnh7aqzmZLUrSQ9pVbLRTFFyeRpF+RBxQcQEjij5+jEH32QvDEnVNukd/X7VtL9ORVbiYNlJhiYReIAJJ/mI= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by SA1PR10MB6592.namprd10.prod.outlook.com (2603:10b6:806:2be::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.50; Thu, 18 Apr 2024 07:10:05 +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.7472.037; Thu, 18 Apr 2024 07:10:05 +0000 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: Anand Jain Subject: [PATCH v2 07/11] btrfs: quick_update_accounting drop variable err Date: Thu, 18 Apr 2024 15:08:39 +0800 Message-ID: <52fca12ea2bd6ec9e64495c5b498d2e498b219b0.1713370757.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: SI1PR02CA0034.apcprd02.prod.outlook.com (2603:1096:4:1f6::10) 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_|SA1PR10MB6592:EE_ X-MS-Office365-Filtering-Correlation-Id: 5e8652de-03e1-4f81-f0dd-08dc5f7692a6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jS+FGHisHD5vSbeacmO5gKGNrqOTeopirGN/7zjv8ks7QzyNe277JmvBaMrSxVZWhafYXBh2TIO75cJ3B1YU1XRvO2VU9in+N+o+2bVY1AjrzhDsRlMmGuQWYSOBedxMKI/AMRvhPmn44XouEhi+zrVuXVPzzywxE3btQbU0wAt1TXRxVa1kzo1xKefccmIBEUmSXfIykn8IoafIFuHi0Yu1BWn5rXYRKGrAeZyc/JWVh8I1kUfSXf4rPeVhO025m1cKmr7fk+eXIEhARQ9Gb8BhMwJQhF7BYRzeWn9N2weFn3y1evz0DuPak7YKDu2COG17H+ppZGDzRdhxKRQHTmXqqiqAmc4GdRMLNUgPtYSLJlYLKTg0ED2Cb476bAF9Weq6vn7yCWSy2/61/MqXVL3W4iAVM9VetIm1+3/rlywzzAtYFGcZlT0gpSLOPKf5xFVQdDbW5zHuXZ/sdtyqA/D7JsyV9p6P6/BYjV5kplOMB/9DZYuVdtOY/GvyVPOltavwojKuXGQAav9vpdYM/1FhzxNGwrWwE49wldkZUATbswD3WfoD3N3hc7hklOn7iraPifXyLcnvOO8uR8UXxbOGqLAxamSvj7GUeRxpoUbusboGt1Z+AXPV0GH9un3oPv1Y0LpD/G3AnueexlEtx/219pcLUnPm8a2EbzManb4= 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)(366007)(1800799015)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dQGtla3txoMThrxZSk/EzA4idBbcI1Ts+WFLISzLNZbEvga0/LJIRnnwY+DXs6w+Jq3PjaIP7ZI2fVdaI1Hs/j+fRjpVfZVc240HVCMiIgWMyb7X33S16TCpb3WMLzoXyN3EgILEipux5cQ1o+cPRUPBbvaSKsU4pvR2+lqAjcDvJ+96gv+daq3VLn+REqxVFuqKvYdXPRII5keTlft+1nMbmkow+vi9qj8BX7XZoiswd77CclMb9rcaphzcVXf3KJtyxvSb5eilnG3GeUD2PA1QMJ2OX7ASG7CBUF89DvQjJInmuCKQWT0WEWqc07QEJK5vZz27JSrqlwsi/NYKwLTskOCEplkdkbRCi5Wv7YsYY8AaPrtR7hHDQadyvlkazipG4NF5lOjnzJAwUSruyTsiPl92p9JFSn1rGQeekFzBBR5l1DiLgt8PwBHeSieBpyTgdbpnERjikgVtIymjnwkT32AkHxXUoUKJu7XzcQ/Bl+8luOjNZuz+2xkbeUzS1JGmMXgqoSh2UHner9rIV+Ut8bG1cOlgUalwidRW099qqlgDLKmpbg2b6cH4ynxrSwA9q3Je2TL2zyo05ImWal3ZYEHWqfGnm6Sw8ywzE2y5Qb2unKfKjbrMZuxYFNWtefqaKwPkuGMoLa4wh4DvLYBfzcP0oB5wsDk1N7whXt6OnAms1tBBesHL77YzFidpHoFUW+YO6DC48r5bm5x30TyQGOOPs7PNb+sN1bHa62vC4/itjXQx5KWWoClz/lcEygLf84ERwYBwRWvixUqMZu0D0MIJG9txbOpHerKnE1mtmmsbVbDXK22QtUKgEXg32Cq5FKlSxi3P7J2VrOHRBXYZZuCxrO6S4ZLOyiwAipO51PwFL8tqEDrl0deNiIikJRCKgcNC0u0Td8Qzr0WzzTs0Ipamk/KCOivYGnGnKX50p5zXCB0ilZaWsuUVE0vG4sUGMBXH7C3wQy6cugPtlmy+TScrmbLQMRWuqvWvCBw70y50ZmmFfRW6yi2KhrQNsfvkBKjMBo6tuuH8B4VYRnQaBCgl3zmfgaimnQAYxOqPRu6S20L5jk3ri9jixAjh8nxGuKKj83JgIjl8G8mwyO2DRT7wTQH8hWn+3vmW8+tKVBrDglQjoVtpU3pa4u5pKXhibqes5uXg/DdNqqigvMYH8AzRrtMjgwNhPYmlV+dfwCcAD9c/gNtKP5AQyio3n0EniWqnLX/2aG6cjwDywv2HXq+rYouSqJ9fPm764HJl52mA/mvJa8fzqKj2PlWYXqJPhLOU3BbvCuMICkSQH0a/NOpCcItSq29pKIvBa1cKuBDMbH53990i2Kxf3oFM6FUhrAlgUx7yFzpaPpasMKZqiVQBVKmUNhhhUuZA2F2sjqsTz2RM0vGJFto+CehGUgNxqMMWD+rMuAJIDd60E6aOS6BIgsviyhul9rNLebN+ENlxCDBJ/wzhGb2FS5drqtLT11DXErSB7psRAO824OjM95gN9HG+FHB0RE2a3Sbi65ZSNES/V2+a4Kj+68OjK1GmuVkum6dc8cgMeALA6imR9jGSg+Xb1F9ZB09LjpzR23YbmNZYXBpJOLdhbOmX X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: oovJ06bEBLUjUCXlrTzynbYt87dTkF8dsY8BpgK+P1wI+lwDHLYjdFyGHw2g2Q0bOaHWmneq5TCgOl7ZYgkZE2zpcjU4c18cmGHG1d3Nqb2jmDh6ZBVovkRj86SECjlNEmMV6UZ0y8ntrj1eWYNF1zOwuJamUmGvvcrGrubGIW5/qaU+AywOtsT8Ghj9GP+9g9YnXBxE0LvTPVmI7m0ExiukPzor27qQe/xVsTKr8b43SriheZ9sJc1Pmr+ZgyPOOKBG7aFC8qXrQS4W50HO4k/UompviD3MQ9/z3LyIVPnH57H9GhYYnq2oJwFa2UkhRT5WpiLnbcNZcPcIj8cbod8wSbraC4SpLUQCA/xkCX9RZmphQ4uleUFAnUTerAnn/DoCQeDMBhwh+Onh8hKTld28zWcOinSim4AJszKUB5QmYnPDYdaPk3GNsMIpE6oyFafyU2qUCeY/VH7PU+qnioLqum/HqQzgpsEeyx9gf3i80oc4hX7M6KV25VNKwYFEAL79SBn4/4fDn7s5V1mQdBHXV4xGRmCDhffRcM9P3MYdeFDAfZiVGRgKdDiCAvuI1Gllb+TMOeAJVmalAIwZwPa5dnbkON7vxbKycsWIDlo= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5e8652de-03e1-4f81-f0dd-08dc5f7692a6 X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 07:10:05.2028 (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: tNNyZGlTTJXkxqZLkzt2UABacD1NybnWXniWvax2fMDnwNYWydE6SPChCJ6IGjU243jD0ZKSGf0kr0JlpuuAjA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6592 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-04-18_05,2024-04-17_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 mlxlogscore=999 mlxscore=0 adultscore=0 phishscore=0 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404180049 X-Proofpoint-ORIG-GUID: ame1Fkl0VCYMw_DNxQz-d6WT_5rx44iF X-Proofpoint-GUID: ame1Fkl0VCYMw_DNxQz-d6WT_5rx44iF In quick_update_accounting err is used as 2nd return value, which could be achieved just with ret. Signed-off-by: Anand Jain --- v2: optimize __qgroup_excl_accounting() error out, so drop 'ret2' (Josef). fs/btrfs/qgroup.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 9a9f84c4d3b8..9a0f47d0c6bf 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -1541,18 +1541,15 @@ static int quick_update_accounting(struct btrfs_fs_info *fs_info, { struct btrfs_qgroup *qgroup; int ret = 1; - int err = 0; qgroup = find_qgroup_rb(fs_info, src); if (!qgroup) goto out; if (qgroup->excl == qgroup->rfer) { - ret = 0; - err = __qgroup_excl_accounting(fs_info, dst, qgroup, sign); - if (err < 0) { - ret = err; + ret = __qgroup_excl_accounting(fs_info, dst, qgroup, sign); + if (ret < 0) goto out; - } + ret = 0; } out: if (ret) From patchwork Thu Apr 18 07:08:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13634236 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.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 D18A23B1AE for ; Thu, 18 Apr 2024 07:10:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713424217; cv=fail; b=frl7lmQBvN7u9xTNundmLq337izNsH68xTPDdRsZVLvZHXgBtqXc/kUXj3mB9oK+Utj1iyswgxhclyy+wLz4C7mRoUhStGaY86EPMChwC7hHe7g8Bn5D/4TwoYArYeh5iNBNAMV6f7oM6EAbePe9WXjGQx/rKRBd8nvSx1mjdjY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713424217; c=relaxed/simple; bh=oTl2ruqGTK7vcqP96rLd8KHhwZzKQSTOAuJL6lT8OhM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=SARsnhhXjBfqsxElq9ht921zJeD+VhnQhiJevjl8HepmE77lcrCCKXeHr0rAOq4Ujh3usvnoKdQA+jQuydS9Z9wF2rGHa4u/J8JTrlEhePkNHDRcDiO+QuBukRU4tq2XV9lfVFBP5ZzsUpJCwq55br9b/h/jNa8ZhKxBX8/MngE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=ZlbALx0g; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=e7yoc/0E; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="ZlbALx0g"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="e7yoc/0E" Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 43I3wl2Z025247 for ; Thu, 18 Apr 2024 07:10:14 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=XVPkwflEmkDL7OWBvWJtFU3JZez0zLbBbBaNYgLT85Q=; b=ZlbALx0gXqWRYtEUTKWVrEYXA9HfqMku+P2ctHaQhPir9OGncnbS/vUSwwScCrBUr5Js 5TqMZ3g1/uB04D+/nKojrGo6CSXL5uWM7+2EH/XpxVR3DAJHhR5FJHiTX6DJ9K+DdsA4 PaDYRrtv4Oo+vFEzx54+UlCHCvqlNQ//cZc1jj84T67itib+4XZN24Hmvl8ft6Kp6GlL oBjiyOvZHZ4pTxdKSb86NQn8s6GE4+SQtMkP0WohoRoMLSggvyJPkwYJ+c61DjHYX2dO 5OjdSMpxKGSUpvWqlo5FK6YWozOA1DxuFy1E6dl10wf0KXsUT/jZKghW69xuY6l37ZMo 2g== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xfgffhnyw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Apr 2024 07:10:14 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 43I6HG0P028852 for ; Thu, 18 Apr 2024 07:10:13 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3xfgg9y7ke-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Apr 2024 07:10:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jWA95Z9p+Zwt10Jl0ZZlMHmhH1RIgfcV4CGkoyV21Ezphc4J5ELKGJMJvLgeLCMRpj5FHthzm907Wn4GpN4tGBp1whEkS5ylH2H9UbRD6qhQaU6fW0aX19j194Iu9z7RFnVa3hZYQW5Kk52K0t5PV2p/FLRyhoMaGmJhYn7wvt7erxC7Qkck8TuSR8zDDyWVEzkoXy9dsNYh7S1IK6wcyMySOeEnqxMBNDxkQbXjs4VsbN127iabxqQf0rWVag7jwbeZJS9QPxWGog7Lw0nbMg+AH65pXbxmAqFza/WbxxNP7tYWABEeTb1K/IB+aesHHcYjGX13EMg4K0w0wRAJgQ== 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=XVPkwflEmkDL7OWBvWJtFU3JZez0zLbBbBaNYgLT85Q=; b=DEJthqjzPjPalUy9L8vUk9Ke0RwwCZu9wm4IpK7NSqoZ6BpKR80jXbb9lqxP0lBsZ1SaECDIaBhNBxFzdCof571QF7BkPSNEpWYOgLLYE3SsAIiKay+3YrFZdpnqUqxLypzDvXF1JiPpymIM2fwmSgojefOPslVev0QO2A7gKykxhiERRRJDFNBoIfCdlGpc/4sXJQYyr6Z92KzQIJX+/QYkyUVuJyX7K4U0QBGI+eQtpPyQvYtqsr2KFIG9vfJJZwrGz1v3U4YhSXG3FltGR++JulUXq/VYkI36Z8G7Jrs5P1Gkv9JCeuo+rVf+y5fTb0am+zqabviOmk9FSTDjBA== 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=XVPkwflEmkDL7OWBvWJtFU3JZez0zLbBbBaNYgLT85Q=; b=e7yoc/0EHQKuy6OAf86+TzxeO917GWWPkR7il/Rn5PRcTJBNk1UC/G1Stb55XoTA+loSP/82D95pc//DROUOTbG3a1JByXrAKduYInHQnKJqMBuymPdr1PF7JZSUqC0LsyhfXfgyQZK6u2fa+dN0Eg3ZCmxJSJM805NKq6EGQcY= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by SA1PR10MB6592.namprd10.prod.outlook.com (2603:10b6:806:2be::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.50; Thu, 18 Apr 2024 07:10:10 +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.7472.037; Thu, 18 Apr 2024 07:10:10 +0000 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: Anand Jain Subject: [PATCH v2 08/11] btrfs: btrfs_qgroup_rescan_worker rename ret to ret2 and err to ret Date: Thu, 18 Apr 2024 15:08:40 +0800 Message-ID: X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: SG3P274CA0008.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::20) 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_|SA1PR10MB6592:EE_ X-MS-Office365-Filtering-Correlation-Id: 6595f016-4d79-4032-ecc5-08dc5f769568 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VqyD0zv8D5rF+EFH55KbA5P31Q4y2tOSamECgRAQjIy4MIWaPSqbEs7mFCzKMze9KlexNAkoFKOmCyO5c0Sd0EBWHSHwrI06xHU83UUu5kbmNWI1DOIrO7i7WsjyOtmFIdlNx8eJqKVOE+aUxC4DBt50dsOCFAlG/5pKeItvduAEesL3BlsFq5z/p6Os/6K+nD3AScy63TMO56qN/FQW26gYC8YBa95IanrYJvPg4Y2P3Cra0Hv59YSSVL6zOXNHAzP6l6jRveRDoyo3PoG1EjLvS/8JRcU0Czo6vBcgtNvKNjYZbLZ6Ly1n/v8WsIe0pcsnK18OhsiMwmejYY+HIL/pwW8OOiZIoVnu6e2gM8p+BPATikCAx7hS1DvMkXM23utGf0CbCihBHK65leTnGzVOf7jfIFXrgf0wpFi8vVUvCaSuv+hwMzdCu18cq3EChDUh2UyJ37TbL9abUiFEJDo3et/0FAnuK+PupgXHgunPS47xliaoPyM2Frz3UEFBI6OtTuh5hhTHKjSUlRDFWmzzeazTK3GXGv5KXPpWwpq45bygBfEADwmbUrnrlYofw+2UQVwwPfEpmdyx8jtQnMvzhdb3Xp3DaGyW6GpAslHmixDhBoDw5+tSyD31TPhqgPXmCMspwVjQpVq86nFK5AIranu73cy21t+R1uKn9XA= 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)(366007)(1800799015)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mh72bwpbY+XIE1v4VhpY88L0re4t1T2gKjGwOnx7iYsTKsWwwW7P4qiWOxW+I2T4/3BuEIj7b3v6AAN3FnAgMd65fqKygm/vkB053YVdjfncszspWIMAd384pSiIuK1v8E6MTVzVzqALg1LQNOxgCohC9m/XOp8JssQaQWurvG25z4km6rwx8zfXRY33kMDLFUe2eUGImZxU7ZNKCbFuAOo1Y8mcp4wPH5rsG6CJa8BRtvybRM5KLGoiBmSXhP5qsytoqxE/HB4xPXxpV3PS4aXBM0Rxcl9qgsilM6ivGt0dxUzlWCblM4rS/c/Mu9CuXZVbAE9NGMIPmn4+p1CmFb4Gv0d5J7Wuq18wI0dfzhh8Kh6TZX63XInuFmWanzs+VRaYDsWHCkbmN+Vib8bgC1MQXUVl/orEHhjExAVIScJPxVKrzB2mIriyjDXgx2h3xJgtCO3QtgdYbayNZ2QybPucihLJEv8EQNixdrIC9TmZTaXCC7vsET9ruZIDHLaCUPcQb9uk6imkCQQIKLs04uPvDWL4IDEowqUrrd4yCsVGP0CFNf2UJz4b40s+YKUiZaTQ5pduas4gKQ/8Rsx9tuT76jodrBVrZdG1nB46f5cBH4b+XRh9ZMWxxKK/HhpnyFvCIsNVwHduhesB1jRv1R+1Y15Do/CH/caB8A5S2unDfd8DscPu3geJcVFP5bLdm7dZYJWHBwYeJGqqzs5uODK32iHzRNFXiBIFEshyIiL5RZzl1O4PLlOQ5kAyonRfXq26fmlGMVGxaVEqWIHWV29+/0rWf3ivjJl+102CAK/rVUZc2pIv1d8NCEUgb4cU6dMgD4uC7yZhIA+Kvc8DxDf+ICp1svI3Q1g64pkCB91KU7kY5yNJcQwLR0/haLTRssBC2by1T6GsGxacd/pZtk65ZSX6xJGcCnwXW36PFlzB8wxC6mw+8ClYUQyZZxy8gd8/NzZSwvAqnTsgLsG41qpfwmPTgZrzGthop+vQ/yAybdNL6b6yi+8M8jri7BE8UYLeDVWWXH00kK4jhoFVt9TzB2TMQ0oxbzlzVnfjm6Yj0vbrHrpDY1hF4g7Uot1v+fDeNRXFGpbbjmpnTB/mTjmnj6cTgPoex3mmB4Gj6KJ5jY9XSv0Gk7h3/LHpF7Wcld1X25LLPFv1zGvJGwcEGJJyHfMPYkw2mkG4xzrp7NIO5MjJsxUNORG91RR91Gbo0q/Q+1X18P7svaOxexEoDxsyZFcRuS2GIZC9GkGQZ511PyqNEqIvpJYAOqbvTVUyhOqHSkzluJ9K3FzMilWIToyjniSoKK7VjuNfFRCoTvy7WGdKN0i30ueCv0a0m3KRh7w+dnChsRPRABj5ueBPQ0oJuv8joG6xJuy6Is0JYREoClxYDxsPEfVZ6EI4JdBjg7Urlwgi/WkPMHkHtzqbPBzsBdfIaB8t4Q3QmSdgqG3DlalAWwxD7lZaMQ5zDKzdD+DkdoT6nRnw+JsEteMn1RtcbArc4UuUipMzdPp0il3entMwJQkBJfVbmaMXvebem/N7oDxkayPUE5VVyQxNtVE+3RyG4MrFcJE51BDi+iBTBpzrvAyjWHhR9j4nS82m X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: axlOnSBZvJzzUIWK3B2aJey90crDOJl/ow6BrHfl5v0x6xr/VcRVir3R4lrgH3ZXSzrhTIiGbKEOBD5pep1mhvMR/LYGPCznYLfDm26YeMwZ/3aJFRKiEV/23Ih3W+61+lCVgw0WFYWRzd6c+y5JtbcSRSGu+hsjNAMAT/b5maVZLhmgvDviHdP+VpOFwCWuB+CGL9DkK6nU+1cKZN4ARd3qsJueblDVJXrlj+Jeb/AyNdvVlHg/ycaS4wTv3Lgb1WLHuHJAnCWi+zzhNaz2ryn9VVZSCCvE/59ei7JIHlJmB9O2FDwrXqHmM6rfjXdkGViepB6HvR+Fz7YhEOc5weNCp84c7CIYdumJc8elSH0d/ljivfZU/fMRHxMcIpwuIE8V/eVG26FljinSH4hOPIK+nRLPolB7VLfCK6lYgy0fnuakpMvsc+3qbRXeuTYSfGxzJ0h+msyNICjJUFol51NpHEi4V4gsnWpFGnOU5kEbVHTZgoZ4cfYSLnYRz7Ejpqo2+l3KG/PCrQjMUPKax1tgQLcR/35zZmKYDclAEwiIlFhClALUpLVWWWvrQI2t/VQSEL7BV9U2AnKuFaMouc3T0mZINe65o2/Q6AWdygI= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6595f016-4d79-4032-ecc5-08dc5f769568 X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 07:10:09.9819 (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: FVF7dZMevZGcDDVLPhioUgVnSjdwHDErn5KGna68UmNIbGHNztVtmOLTX0SIvzzORgKzu8dwdtNhPGtEMWLHOQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6592 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-04-18_05,2024-04-17_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 mlxlogscore=999 mlxscore=0 adultscore=0 phishscore=0 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404180049 X-Proofpoint-ORIG-GUID: jUr08shKn4Snk2y7L06rKB4onI-VCzUa X-Proofpoint-GUID: jUr08shKn4Snk2y7L06rKB4onI-VCzUa Rename ret to ret2 compile and then err to ret. Also, new ret2 is found to be localized within the 'if (trans)' statement, so move its declaration there. Signed-off-by: Anand Jain --- v2: No change fs/btrfs/qgroup.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 9a0f47d0c6bf..8ae0e1048b23 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -3703,8 +3703,7 @@ static void btrfs_qgroup_rescan_worker(struct btrfs_work *work) qgroup_rescan_work); struct btrfs_path *path; struct btrfs_trans_handle *trans = NULL; - int err = -ENOMEM; - int ret = 0; + int ret = -ENOMEM; bool stopped = false; bool did_leaf_rescans = false; @@ -3721,18 +3720,18 @@ static void btrfs_qgroup_rescan_worker(struct btrfs_work *work) path->search_commit_root = 1; path->skip_locking = 1; - err = 0; - while (!err && !(stopped = rescan_should_stop(fs_info))) { + ret = 0; + while (!ret && !(stopped = rescan_should_stop(fs_info))) { trans = btrfs_start_transaction(fs_info->fs_root, 0); if (IS_ERR(trans)) { - err = PTR_ERR(trans); + ret = PTR_ERR(trans); break; } - err = qgroup_rescan_leaf(trans, path); + ret = qgroup_rescan_leaf(trans, path); did_leaf_rescans = true; - if (err > 0) + if (ret > 0) btrfs_commit_transaction(trans); else btrfs_end_transaction(trans); @@ -3742,10 +3741,10 @@ static void btrfs_qgroup_rescan_worker(struct btrfs_work *work) btrfs_free_path(path); mutex_lock(&fs_info->qgroup_rescan_lock); - if (err > 0 && + if (ret > 0 && fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT) { fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; - } else if (err < 0 || stopped) { + } else if (ret < 0 || stopped) { fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; } mutex_unlock(&fs_info->qgroup_rescan_lock); @@ -3760,11 +3759,11 @@ static void btrfs_qgroup_rescan_worker(struct btrfs_work *work) if (did_leaf_rescans) { trans = btrfs_start_transaction(fs_info->quota_root, 1); if (IS_ERR(trans)) { - err = PTR_ERR(trans); + ret = PTR_ERR(trans); trans = NULL; btrfs_err(fs_info, "fail to start transaction for status update: %d", - err); + ret); } } else { trans = NULL; @@ -3775,11 +3774,12 @@ static void btrfs_qgroup_rescan_worker(struct btrfs_work *work) fs_info->qgroup_flags & BTRFS_QGROUP_RUNTIME_FLAG_CANCEL_RESCAN) fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_RESCAN; if (trans) { - ret = update_qgroup_status_item(trans); - if (ret < 0) { - err = ret; + int ret2 = update_qgroup_status_item(trans); + + if (ret2 < 0) { + ret = ret2; btrfs_err(fs_info, "fail to update qgroup status: %d", - err); + ret); } } fs_info->qgroup_rescan_running = false; @@ -3796,11 +3796,11 @@ static void btrfs_qgroup_rescan_worker(struct btrfs_work *work) btrfs_info(fs_info, "qgroup scan paused"); } else if (fs_info->qgroup_flags & BTRFS_QGROUP_RUNTIME_FLAG_CANCEL_RESCAN) { btrfs_info(fs_info, "qgroup scan cancelled"); - } else if (err >= 0) { + } else if (ret >= 0) { btrfs_info(fs_info, "qgroup scan completed%s", - err > 0 ? " (inconsistency flag cleared)" : ""); + ret > 0 ? " (inconsistency flag cleared)" : ""); } else { - btrfs_err(fs_info, "qgroup scan failed with %d", err); + btrfs_err(fs_info, "qgroup scan failed with %d", ret); } } From patchwork Thu Apr 18 07:08:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13634237 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.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 50EDD3B1AE for ; Thu, 18 Apr 2024 07:10:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713424220; cv=fail; b=IX6lR0jVF7AuOTQUbv48XiD8rNA/on1OLXJ7MPkjT+I61LxoCk4sRxo0dfHcYgNOeqxIJD9TSIgY/dpnH5tJt08ZIhAXFfNiN3JYKRtWY2SL62XrNr78q90sEtLH9tw5+u4CNzv7PRwvGtKii72XM0zE1A5B+X16SyOXZzKms1k= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713424220; c=relaxed/simple; bh=LFc/akKQ6UlugHVcLO+jLFXIUx+hhBfmy/Xjjuipvns=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=WuaejvhbDqEZ6Xkn6CZ3kluWRX9nH0WlcUUCT80LQdGPbkgFbIYXUcijjNCII2a/liV+KGMPu+lc2WiFCg13MxuWdJQP5N12XYfP/S79OFJFC5+1EG2BHZ8PphUt3GoguPIXRp95GrjtOyMjg2DPs2HTldH69kjZS6t8q1j+q2I= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=R6i9WsCB; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=K6Ea0mXg; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="R6i9WsCB"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="K6Ea0mXg" Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 43I3wxcO031358 for ; Thu, 18 Apr 2024 07:10:18 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=Ji4ZqNP9fNZUCSexmnB/02fwtxMlkE67c0+hj3/BnnI=; b=R6i9WsCBojKTaKyjYiHoYE1A1334eBYFbgiEU/9FTChJZfMaWH4C2X5whivlafIR5bhG quSK8OT38Eo0H8nOVekYedBnFZrqtnc2r3rPvIo2PDzYvvAnLq+ant1rQ8L5PKm04F1N AQEN3zDbhmB6HQ6v4zQ1rRom7iGMAlmjhXylTmNIgBSxA949vPyvgaUVypH4uTVRF7z1 xSAZIUFNP/lAPrcRdjk4nllQqwTL5QLbaapeKah4+VvSw8DnCEeYYOPdjiAqIEpQCugp vltsKKM/1T8EfXr1FjpxGOc5XJc3Ih7PWO9LZavjLTFteMzbwjTc6wxVw2DyTKVMJhXi 5A== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xfhnuhr5u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Apr 2024 07:10:18 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 43I7A8jP029247 for ; Thu, 18 Apr 2024 07:10:17 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2168.outbound.protection.outlook.com [104.47.57.168]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3xfgg9y9c3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Apr 2024 07:10:17 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dBwG1q1iZUk1OJTVYcFg7Jyv8obJz7I7hNB65W+rp4DAP88Zd/mTW3F5j2D76bkilGe3cV7TQATCx85iflt+OEYXSEq1HeIGjs5qfnvWDLFKXfgErktuDp0KUY32CkwBAW4SdZdO6i13El1lJzQ1ztfQybuAHToPAVE7hUYI2LL4svZbWQaqtBPo5wjseKtB5bqHpSTBDWaaP0BQaVlR4Iko9u2ocifZcgKctExTJnFMriYWOJ+BGZczT+IREArffSt7CQKZF2e2bQsGon0QQzM8GsS6OAzO4k0yGfdkVV/jhqT+OA86Lk3FCybCsTYhf2mvVb7FV22nhY8KGH6wdA== 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=Ji4ZqNP9fNZUCSexmnB/02fwtxMlkE67c0+hj3/BnnI=; b=A7AchAcj0KXGuWmyqog52K8hBLUA52Pn1ao0KsUI+WK/rjW+uufPDWLxxwwUSS2TyKbgmEfs73bfeZ9Xl2pcMNBiAUsMOlxVytlYZFOzV5jp/yakfYVX3pHGLNqgBZYVpgLGEtZwMNU9fEQigvfmO6aO5pxBrK+ySsZnUun53fZ/p/f+R3D62vzrZ57NLyqnHYiN8Gmd+ABa3haQU9u78syY7F+vmKHJG1NcWyjRn5OZd8z14HuenbpNpKe08i/fiDxrSnZosP9lwWJ2XGnON33oWOz9xwHSWUSYE53SY8tuUCs1symzFho4ihs299Vwq+38UyPYDlkPBza5LEUX8A== 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=Ji4ZqNP9fNZUCSexmnB/02fwtxMlkE67c0+hj3/BnnI=; b=K6Ea0mXg0hcVNvy/SVzVSd+QOIG0fXBZt1c/zULPtc/GkHj9oYlo6kHU1Rf/zYZhS4vQuWpjq4ePNFNfEyIVmVe/NeHo8Z7q4EosQ2JKz1qVRuSeuhq6w6RtdsIgJmQTQAmyXCHtc/KSiWtj1GkSjKj790Wg3HKtvEJajR5afIk= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by SA1PR10MB6592.namprd10.prod.outlook.com (2603:10b6:806:2be::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.50; Thu, 18 Apr 2024 07:10:15 +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.7472.037; Thu, 18 Apr 2024 07:10:15 +0000 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: Anand Jain Subject: [PATCH v2 09/11] btrfs: lookup_extent_data_ref code optimize return Date: Thu, 18 Apr 2024 15:08:41 +0800 Message-ID: X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: SG3P274CA0003.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::15) 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_|SA1PR10MB6592:EE_ X-MS-Office365-Filtering-Correlation-Id: 80f09039-640c-4d49-37f3-08dc5f769892 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8k09qI/szSytCIFcXaXELFgt5aUkDOUup+k5hJ1JEl4gM3dPlsuVegR06+HoYx6OxO73dbKU1orpHMsmZQbJHhnk+FurQB78ZnXsoEKzc/RSq4zU/sZfg7VTk6/AWtSqa2qFlZxRd/hZlBUkcjjwy6RlRI4GgLSzqaB7slenmde6ERWQdjvRfiTaI291mhlI1NhqzszgedLHroRhy3SzuOsJznfQm15qZQE9czBHkqFDTNkcPPUxf5F8SnJPNCZ0JN39urgMfwB5Wo9UQV2eG94Hd0nql0eEZaTP1fOp8StbotZw1ruvD5j0cDxb0Yir9CJBVTP4H5h4cQQJQUnebPi/IpPOZbW7xrr2c15031kzgdfyeR3hpeM/ThBPIK5q21m1AsqkRRq8Cy2BuNb42vFKgIbHeZTV6AxNtc4PaGRAjmNpSvHqRZM8C3MZfhIWM424rFkU2V461UxeSMtWfvDwRsd96ZLMOKRPRuYTtOnT2fRm3ZP7IlDtJAVgYlPeigVZ747Edyynb7mqqnhN2BI5rF8lT3VyDJ91bFWGI4aQfuhgJfec+dhxPsbMLOyUDyKSKFdDqRRJkdC5BWGL+66dGqEWprXS3ldpLWSz6InPX/DuaucyWuTjqQT5yvnQ7y1bPbf8K8Nigz0hrx/7gCuAqsngLbwXaYD9QAU1Axo= 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)(366007)(1800799015)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9hZAXC+yfuxU6B0J+mq5uarT3gx3Tq5W/JcoDhH+yiPeNa2Tdn/tS7iEGYLXCJy5AClXVLTHK/+JB/l/ObOFIhQ4rOkd33ugRRThWXbc15/HvrhBzBUcmR5zn9TWkd8wo+9yauNcdc3gK/ZZNxmlZemFpDjs0P2wVKwKan2ZfiYILs873nwJUeZTBtY/T++4sB5fvdHJL0GU6y87ohNxW9rikdHECV4rC249J5KFdZXlrBoCjbQPNPzapK9B3k1q1+wYb9RMGyTnVUCSdg+O61gYkJq4wwXkAS6ZNjLrbdCodaRUzwtemTxF/3NN4XedFt1B2uM3JITaic6hqLxV9+VGtJteCkVy23BXLkofOedTg0+pt1Yu8f2RgPgsf8LpAd6plSv1W93ipNOjFJUNFKtrVdMTo8oK/kNtjGcRuV08UCl+7OA8NLgu2E/30f/he+mSkUxBP7d8tAFb7j+9rHY+ePcpvvMScpRlFMxcfekisHIVAYKoa01FA8dYwQe40n3BUfDzK51gbzAeUxUNCNEWKv08br2LiNtMlxP1nMQtcqD8sl+3hio1PwoxDeQLVnUQaqsh+CHYLOprCI4cZ8AqPfgqeTXGXr7c6ZxBjdS5KuhQWYf3HdtRxEGgFok/6fgfh0+GPC9/yN7jlFXJMLkXDlf1+Ko8Y2xM1FTTiuWihVEbGQE5N7wo2f/di5wXPsX6nXx7vXkN/ssYCq2dF54DDJk3MWPa6N3Qi2iP/qy32XI/q5vLC6RzQIHfTTG47A7Xdm2la5RoDHSyL0jJYVwDMd1OObLIFdj1l7o+c+77IVe9Epfb3fA9PH4qIhlAH7l8mMlbYyv+3OE9dOMmla5+1zpVj7iQTXgkDjFAIH/v9pyTr+MUyDIy2HSi1kBHJlJQ9E/M5ZxnbyP1foThlmJEbv4EayTbEzIzcBA3TS7NaUKdjULqogMrxyWt/IwHl9+58HzUCaClSPeBZi1wqC847v5WOvlGnmJLRBoqIbKs3IEcdhoAvmTMWHIpfGTq/Lml22GIJsOItfdzMLdVfYGuyOeVNSG35b98tQ2P+yB+5KnnnnUxCUZpVnb6OHunMFZ39g9pg5NMtnSTTwxeXANfv+ClfNgJQVWDj8Ks8+v39K0yed3hmR/atFYDdUafmZ4CNNEBt5RBuB04QhvBEFjoIWcpfaeyWSzvG9mBX4Q5IK6fiMto5pWQL2jYZj9kCAFjdsoK8Ll/F3LNrzUcyHdsQDZ67YKYcWr9V16hSpUJasQ/M0j78weJbmVEBbJ807Xx5rq7rbCEaCnhDRlJhcTJE3GWfLB2dCloT7CK8flrqW4PNcxaF0RbPXZWdXiKTyNkrTL1SxTHA2hU4RGVzI37AwfjmAveF7ASfkoD/djkbeJvBl7PS3kLu7e1ytuhQLZwMg5b/wnZx7ZXyQkC9pHsN7GqKTUbC8RJ06FW3uTGgP67dBR/ZIp+m2y6dP95YhYonzKiKQTnfWMc4NmWhLOjPy3gngf6VBs/GbdMpI4iRBiXb1FzSZguf6SBmOGZFzmeYcbxqKiHWSZIADHMIe+wiXYZtbZTDGYTMbsCah608ARDtzj2n49LfsSZMjt5 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 5YWXAZJeDxokNzPT7dLgWBjipvc8Dhfb4zH8PfZG0Kwf86J2LJEnKVAgn91Hvz76S0WOIFlgwMA2/fxISC8DCy8VP0GOKrOywsNlsG1HhkSsUQbvTS/6VRq6g6nxW3tk/72sOjSjl3acFbGLl4EYdFdLC+c9NTPmev5MIJktZ2q0Q1jqKbzznDpazjqBJ8mtAEkBrqSTg9JVA98HWN5Y8w0Mus46ep2QFMZX5n6PZMyvclZnxPYkgOkadmSXD8fXyF+z6LU63A1iX9VCHhhE0eKLOV/4BV+Wabo50YOkCvCM7igp3JhczNqflURusbqCl7VlsylqlostVWNhk2Op4vRhIr3LWZUplj5pe19CT5k+jbTlLARnNobCnKItBqLaSxd278+OIgeOTaHhWTAtilrVGSIEJW1GifOo6Q2HjzW3Lc7+d0fbEVb6UVFjb0n+jBUx0IGcjbCmkwU5aVyS9cwue8InuUATxslU7AkZUz7Y4GKH8HuBhUCCOK+nTabNcuGKEfK/Fdt7GdRbJxCiUjXXWb6Bxby/WMEmxn2IMOZ+ijQnyeRZ6XSvQNV+tsMSe5ju/4SDIvLpZqnMCyArgf9uH3CTycNEY3RvVlwokCI= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80f09039-640c-4d49-37f3-08dc5f769892 X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 07:10:15.2680 (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: LFLOYvMC7wczYmmp5VxnRupvwVhqivhW3gH/ItLI6ArsbxQWNjtfP2+6Vvt34ZA9knrTQ/dB+k28zxzR8ZaXWw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6592 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-04-18_05,2024-04-17_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 spamscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 malwarescore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404180049 X-Proofpoint-GUID: 41HI3dMuBsPUwQloIXtLhowpHgiwBmNj X-Proofpoint-ORIG-GUID: 41HI3dMuBsPUwQloIXtLhowpHgiwBmNj First, drop err instead reuse ret, choose to return the error instead of goto fail and then return the same error. Do not initialize the ret until where it has to be initialized. Slight logic change in handling the btrfs_search_slot() and btrfs_next_leaf() return value. Signed-off-by: Anand Jain --- v2: rework so that 'ret2' can be dropped (Josef) fs/btrfs/extent-tree.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 023920d0d971..78dc94a97e35 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -446,9 +446,8 @@ static noinline int lookup_extent_data_ref(struct btrfs_trans_handle *trans, struct btrfs_extent_data_ref *ref; struct extent_buffer *leaf; u32 nritems; - int ret; int recow; - int err = -ENOENT; + int ret; key.objectid = bytenr; if (parent) { @@ -462,26 +461,26 @@ static noinline int lookup_extent_data_ref(struct btrfs_trans_handle *trans, again: recow = 0; ret = btrfs_search_slot(trans, root, &key, path, -1, 1); - if (ret < 0) { - err = ret; - goto fail; - } + if (ret < 0) + return ret; if (parent) { - if (!ret) - return 0; - goto fail; + if (ret) + return -ENOENT; + return 0; } + ret = -ENOENT; leaf = path->nodes[0]; nritems = btrfs_header_nritems(leaf); while (1) { if (path->slots[0] >= nritems) { ret = btrfs_next_leaf(root, path); - if (ret < 0) - err = ret; - if (ret) - goto fail; + if (ret) { + if (ret > 1) + return -ENOENT; + return ret; + } leaf = path->nodes[0]; nritems = btrfs_header_nritems(leaf); @@ -502,13 +501,13 @@ static noinline int lookup_extent_data_ref(struct btrfs_trans_handle *trans, btrfs_release_path(path); goto again; } - err = 0; + ret = 0; break; } path->slots[0]++; } fail: - return err; + return ret; } static noinline int insert_extent_data_ref(struct btrfs_trans_handle *trans, From patchwork Thu Apr 18 07:08:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13634238 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 3707B3A8EF for ; Thu, 18 Apr 2024 07:10:24 +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=1713424226; cv=fail; b=DOhrt1oECRu0tXa777BD3IiCd3n6w/PC1wPjH9DjT+/4ppaFXzivgfKOxMjL72JjX6HrU3GFVgFjMxQEsJnW8vMpnnMlhD9voUX+pap8M/mQcMcwhWgphbTmKsEuUNfNzk2wrGyjA2Fkk79/nT1+AfZmIAjapPZoMP+dMGNE6V8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713424226; c=relaxed/simple; bh=537eEPHFDNcyY+MycEgQGPCuSIg4t777Hyc4NmpVBfY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=hAYjQr+grijEPeWaNzXlr0mhtkYSOx6hVtxVczrl5TpkTOhYaV0K5QIYucquAZtCb7oT5eoizIrvj/cOSUBkZxgPTJUw8qq9sAiLjW9ghy0i0/lW0BOgDiXzLgIhm2hg4QTu7sItLSnJfvJ5DyQUN+7WQ/pzs579LYSaRE+Vzb8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=KAsqCuF4; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=W/5HAS4i; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="KAsqCuF4"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="W/5HAS4i" 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 43I3xdDL010638 for ; Thu, 18 Apr 2024 07:10:24 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=UxVcRDj+XeM26azeIzkQ+u940YDkyAH6ER+sy461qy4=; b=KAsqCuF41i/+c9gbN2jzxC70tAwsqH3PWPEvCfKTO1hL40JVJFViF8MfrxEJBqTvQ6Lb R/++694ldIpTjEGvwV3OADP7GhGSsloz8/SALCUSJnt/RO6rmjhBh1/dLNuTiXB22qv5 jCP2CruLklyiJC7bXmgQdGnfNnQN2R/+mD0MChtypvv368XSlqhzIsAON0y6wp6qMdXb LOIsQ+ZNkPnmfDeTjNs/2abIUqtusWJxQJerAxRkZYOzpXJzSU0ynToUK6478q3HbSxd o8A0V7xIj9iqB0T83TDIXDLp9rikmoeiP56pBkJPOVIbglntzYWJZQw8y3pVmDoC3VhF WQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xfjkv9k6s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Apr 2024 07:10:24 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 43I6RVc4004927 for ; Thu, 18 Apr 2024 07:10:22 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3xfggg8a3q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Apr 2024 07:10:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YbJqH8ZD5uLjXc9SJwEhrNnPZWVJdra8XyjK+BG5Ue9bbIB89ZwAnvaOV2f3v0yERHAMfe+vIKJJtJ2JBo7m/JZZtsVS23kA3v2nEOWGhfyw1mJabJ/ahB7aDWDhR6DAERqEZD3ciHEtAxhx2smJK4zDeAyV4X/3SPfvQj01uB3hwTMGAqA+t6TffvnA0CxzCWpB4LDWUey6xpybrvLqgHrFf9iZ0AclwQ619yJvQeqzDGJr1RM84Y5fJOXPHrsXD0iGoWJbmVF2vzn9ov+3oKPtPq61KVzOOgx8thMfMl9Ses846EJePHBf7f3ZMODnzmFpcOZ3i58+pda+9stPlg== 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=UxVcRDj+XeM26azeIzkQ+u940YDkyAH6ER+sy461qy4=; b=i+VBkUTJbqlV6dvY05JBkbaoqO+cg99zMAgxdPqpO8U5Sk1Hn+lOce3qKAmFikP4Szgoabwo0R1MP4lxrtWCrAT2jjr4QUWHaj+yHBklylCuAgDVnVOwLRg2WPG+RtVmFaOCssOTL6ctclZNdLKG8K4ALULbou7xTGkwo5ahcpsvwqMk44iRUWT7DOC3m8Q7bFriG6n+kFQiDPXggEt4pvCyUiF1tcrl0ZbIxSThINc5aLtnmckRI6Rb+xjZGXnwJfFfMUk1Q+5UZriPPwUp7y4z7HfHZwCxi8Vo8/4pS6YE8sINsiyrGngjqC2cbLxFPi9uH8t8e1jadVKdAqlOEg== 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=UxVcRDj+XeM26azeIzkQ+u940YDkyAH6ER+sy461qy4=; b=W/5HAS4iVXFchgePP5H2xqJ+bYHE1pYgegYTt9cvoLe1O/cZ4s/BaHrAcxnWq9WCPY1IonocWklz87fzvqbDDVoMFUdFjhoy/pEl49Oo4W/+RwwMBdBL+vAt78wutPym6GFq37naPz1Iy8F3pR9q6hBNaSlACO9OZyppZg6x6oU= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by SA1PR10MB6592.namprd10.prod.outlook.com (2603:10b6:806:2be::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.50; Thu, 18 Apr 2024 07:10:20 +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.7472.037; Thu, 18 Apr 2024 07:10:20 +0000 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: Anand Jain Subject: [PATCH v2 10/11] btrfs: btrfs_drop_snapshot optimize return variable Date: Thu, 18 Apr 2024 15:08:42 +0800 Message-ID: X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: SG3P274CA0019.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::31) 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_|SA1PR10MB6592:EE_ X-MS-Office365-Filtering-Correlation-Id: 05264a34-4aa5-479e-a2b6-08dc5f769b79 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SU1F/Q+qWwruYAUYqpl7gZC9R0m5OamII89d7FWC/Kf/MkrB3pVfb0jOzZQ/AbxJUDDQ67tHe1u08Ikq1xSLRJ7e80OkAKeUKWeJ0JNMBfE94Q+hcHw7RbkmWMlM7dpox7kGPoh+YAr2LsQgz+a/bKzMr00i+U42fl3UW9U+IgbkHgUovljhDqlkVf2Q9whaLOEJ9f4yAs8hyRIE+ya3deohXWQ+2aeINbd+p2Rfc5SgfPusMpBZK55dn5HiOApeY9K14ksdAHPUZXJqx56swcOlONsX78Bvh8BY7Ef8WoLgXNjbcKShinJgzVo7jlMgcSUdV0vPYeSorXAZ1LO6CJyXs/ocgy5Pt6MIoFjsl7keTE5q9GM56IHS+kuJVTUUFKuRKq7t7oLQodqH6Rkfb48HN54akFrBeI6qHANmlvvZ68DXHWBrgG1vw85r7Lv378D8h5+sTS/WxF1nO+V9ZODB/ElYIXK/yjaCyISum7qU7yTOvg15VeItZzASxUddc/jOdSJ3IQHHVjmphFY2/Y61PD81I/PZuqCg6yDtn+gaz9BWiMosOX4FApKDjrX6PkVo9ybIwjUhLlpT4kLi4ObxgUXOpZBqFOPLxkPgwnLWWx91bWxvHkR9+SBzSSYuW8l938GjKFOILf6KlUS7JA== 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)(366007)(1800799015)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pOPLEim+Ph2VsARPf91KgRc7/NKB5H7i4uCXlfD17tpLFDRI09bqMpur5mHSgC4jNqsmIjvM6yX2kw9qsGsVWsDKROx9aGJ9QppYN1c1pkDpV+QQmPfa7BVxozyIEAK9qOy9uAlsbqoBeLJgDVTFFqHaUu9zup2IKi/1WdK7DNRGUSYhZCCpCFJCQ2Z6jL2FKA0kQWm2yOTlpVI6xMA8DsVsVJjWjGYx016n/5q5XrWzPqAW1/qIqfB96/QSO6GibEwwgtoTLoAbMafCVQPUs2SmL9LFn0XmGBbT2O3b5YmgsQccmOyxrkD3a7A4xdwBGQyZ6GzaPBUjlkXqbJjYlapHqEince9hMCBlM8C3tWMoPpKuLj6sVFcS/3DAWwt8qxMsqFMJoL15+JatQT29HkYgXPdx+ybB3X8a6wXwLjOKhVZA6wBnOMh47mnID/pA+IyIxK3yOnQtdHOCvBbB5u1YfjRdSSFuDG/OUGKDAqZMkwA06m22SM9WYQlrjWs77vNO0CboqoljLbh9uW+r9oVMh8fJKWFGdVJmCZN8ulqmyrwxY8I/pczoM5OHBc615ChM7NK1SJWt7VBW6iKxAOEOleMWOLgD1qfLWD5C3ZQ049MLLAU30DSnTzI0CUq3mMnuM4WgNIVJVwqa2DPRktsIe5ywKp4dA7BaHnI47eoL/nZw5p0nSaor1axPWAi8NNaDCLyDfA5is53ev6YvhYVM4cdeMBBJKYkr+/ihbTROZzAPBpbqU+vD6V2kyewvUDVDDltGCn0tRQ8/xJIbHR0xRJoB7THEnuQjDFag1RCsQyDligWlnzPHNw8HumEWv7NP6Vmu96ctpFBBAG8CaUDOQwWhWuafM+EvhdgYQDkYU0XdMdutMm+UaeuItW574Taq7uSZ0I8Q6grAsNvFNQyVabOQn5ouWQQfGWFyOjWq3pZghj2jKBInhUgfMbrV7+izDD14TL/ez6eVf98qHnFMiLsd8menRhCZllZGjg5pz0IDgz6aVCh8nANx1BjQZ0ZmiiJaSPAJpmoGgiv2FT6m25dISpk13ays6QKYP0cQex2Rv2syZkRQBBXs3MqrZ6aDL850NsMI3EkXOPqS1F74rKI6ZatZlAhpRECNKO0MirNzV/tkvAkRjwaFNvfRi3J1GxCbkRw3TIZoVHVIhPWq4yfWbC60S3QFAAaIaTa1wJtd2NlwcClkIkZdBN/IJgo9GRbkab0y/YhHfFBNYlW6ir0iM/AJjz4tDUs0HDPT5uISIjiabeTMSYOzi2ME8Zf+IZNuBHweW1/O+YtQrEXRI82C4ImnzZom9bIQTytzqcLlUjuNIC7sdroWUm2vEl8njvAMF6g+gVxuL+sam9dNkQGrd5Gee65P1295eXPkTplKCfhvrl9OgCMOuVX4hNfcwoj5URXWj2T1EzpjrIGv1LauCPkc/2n0Y6vyFMZ+QB/71uNoIK5sTTSKUPbir5Xbd1gZ+s0IHMS1dUL0qa7uIDckDOscNAjqpIfMLlyETRuu8l7TR3C2ey0gAqVbF5Cg6v+6Ed7ddm99o5YSEFNIKskSIOnBibfzeyRu1EHsgiQK6RszR+eGsAttCY1y X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 03Ca8Vl5x1RETHhVVAxcm+ubsWxzFhtkZIKU9Z2G2Em2usIpCgeLKi5oBp8qO7tgkb0EsyECWB6tWLbHknZe+lSGUjvbQmZcw91ywy6+nijBsPjLlwYqkM+yGh6k1eRFwGQUi9+6tnp5JegSwSAd/AG38rp3Fz3h6Jyy2yHkv9BuVwYdEvMnJ6MYkogetBKA2OxOrcGp/domaKd1ECBB6fbHwRSPBfp1h7FgAaPcn/6T0H3dISNwmRA3/e+Y1y7M/aZJhfcZaLCkQPKPswI28sKLyZQUG0urfrDQ2Eaa560Q4D6OGCjK2wytIzzdJ63vqOsCMiGrWiHNGqGGVID7Z+OuUuCvXAfcBVeCBE7hOazqAUHJLenrWn4kiUtWc0A9TdqQ+EH/FLqSW/eO+U3aVxGw2iTqKaTulLt8EYVi9QppmJHOkM6680xfDdcYfUnFoLR1j07e9Gabhm1460E9C2tGW0ZZo1/bCMrQ7zU6oKSO8l8kt/oCplmVdXsfWcY08Dmg8KE4oIbnabtus9If7Ilja2CjyW/mIemn8PDLH4YMV2YkkHViNRzdpspf0z5rmI9pZUIcqfeoHPr4JHcsysnXxNZccE/H32xLKjc4dyM= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05264a34-4aa5-479e-a2b6-08dc5f769b79 X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 07:10:20.1527 (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: G0lIt4OqKoHTJFQbH+wdK6Xhk+TNvYbg4sJQ5CWU6P1ygOwts1k5u0UVxJtkZc1yaTSwQMgYRu4+wzJ3lQkRQg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6592 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-04-18_05,2024-04-17_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 adultscore=0 mlxlogscore=981 suspectscore=0 bulkscore=0 spamscore=0 mlxscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404180049 X-Proofpoint-ORIG-GUID: CiDl-mqBbSjJ5uh25AmqXaUsFG2JGwwe X-Proofpoint-GUID: CiDl-mqBbSjJ5uh25AmqXaUsFG2JGwwe Drop the variable 'err', reuse the variable 'ret' by reinitializing it to zero where necessary. Signed-off-by: Anand Jain --- v2: handle return error better, no need of original 'ret'. (Josef). fs/btrfs/extent-tree.c | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 78dc94a97e35..17aa45b906bb 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -5833,8 +5833,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc) struct btrfs_root_item *root_item = &root->root_item; struct walk_control *wc; struct btrfs_key key; - int err = 0; - int ret; + int ret = 0; int level; bool root_dropped = false; bool unfinished_drop = false; @@ -5843,14 +5842,14 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc) path = btrfs_alloc_path(); if (!path) { - err = -ENOMEM; + ret = -ENOMEM; goto out; } wc = kzalloc(sizeof(*wc), GFP_NOFS); if (!wc) { btrfs_free_path(path); - err = -ENOMEM; + ret = -ENOMEM; goto out; } @@ -5863,12 +5862,12 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc) else trans = btrfs_start_transaction(tree_root, 0); if (IS_ERR(trans)) { - err = PTR_ERR(trans); + ret = PTR_ERR(trans); goto out_free; } - err = btrfs_run_delayed_items(trans); - if (err) + ret = btrfs_run_delayed_items(trans); + if (ret) goto out_end_trans; /* @@ -5899,11 +5898,11 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc) path->lowest_level = level; ret = btrfs_search_slot(NULL, root, &key, path, 0, 0); path->lowest_level = 0; - if (ret < 0) { - err = ret; + if (ret < 0) goto out_end_trans; - } + WARN_ON(ret > 0); + ret = 0; /* * unlock our path, this is safe because only this @@ -5916,14 +5915,17 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc) btrfs_tree_lock(path->nodes[level]); path->locks[level] = BTRFS_WRITE_LOCK; + /* + * btrfs_lookup_extent_info() returns 0 for success, + * or < 0 for error. + */ ret = btrfs_lookup_extent_info(trans, fs_info, path->nodes[level]->start, level, 1, &wc->refs[level], &wc->flags[level], NULL); - if (ret < 0) { - err = ret; + if (ret < 0) goto out_end_trans; - } + BUG_ON(wc->refs[level] == 0); if (level == btrfs_root_drop_level(root_item)) @@ -5949,19 +5951,18 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc) ret = walk_down_tree(trans, root, path, wc); if (ret < 0) { btrfs_abort_transaction(trans, ret); - err = ret; break; } ret = walk_up_tree(trans, root, path, wc, BTRFS_MAX_LEVEL); if (ret < 0) { btrfs_abort_transaction(trans, ret); - err = ret; break; } if (ret > 0) { BUG_ON(wc->stage != DROP_REFERENCE); + ret = 0; break; } @@ -5983,7 +5984,6 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc) root_item); if (ret) { btrfs_abort_transaction(trans, ret); - err = ret; goto out_end_trans; } @@ -5994,7 +5994,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc) if (!for_reloc && btrfs_need_cleaner_sleep(fs_info)) { btrfs_debug(fs_info, "drop snapshot early exit"); - err = -EAGAIN; + ret = -EAGAIN; goto out_free; } @@ -6008,19 +6008,18 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc) else trans = btrfs_start_transaction(tree_root, 0); if (IS_ERR(trans)) { - err = PTR_ERR(trans); + ret = PTR_ERR(trans); goto out_free; } } } btrfs_release_path(path); - if (err) + if (ret) goto out_end_trans; ret = btrfs_del_root(trans, &root->root_key); if (ret) { btrfs_abort_transaction(trans, ret); - err = ret; goto out_end_trans; } @@ -6029,10 +6028,11 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc) NULL, NULL); if (ret < 0) { btrfs_abort_transaction(trans, ret); - err = ret; goto out_end_trans; } else if (ret > 0) { - /* if we fail to delete the orphan item this time + ret = 0; + /* + * if we fail to delete the orphan item this time * around, it'll get picked up the next time. * * The most common failure here is just -ENOENT. @@ -6067,7 +6067,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc) * We were an unfinished drop root, check to see if there are any * pending, and if not clear and wake up any waiters. */ - if (!err && unfinished_drop) + if (!ret && unfinished_drop) btrfs_maybe_wake_unfinished_drop(fs_info); /* @@ -6079,7 +6079,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc) */ if (!for_reloc && !root_dropped) btrfs_add_dead_root(root); - return err; + return ret; } /* From patchwork Thu Apr 18 07:08:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 13634239 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 4408D3C473 for ; Thu, 18 Apr 2024 07:10:28 +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=1713424229; cv=fail; b=rZ9khD+2zobOcI/y1OQ7fw5sPA680WkskAPbPY+AUswAgY1oOP6x33IxA8xp1lgXY+c0ax5ngC2daQN7HTlpLl3rkIVDHhomh7N//6VtDcTOCJb9ob5rJpTT2PVFniWxk1iZ7TcdIM4gVU3U6L4CgILSTCXrpHAnnwPTDZfqGj4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713424229; c=relaxed/simple; bh=rqQDo8CRlf67UMmrNo3oylj7TkkrY3CcQVIfYKSLchg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=SBW59N3j22INL+jHgCVbg/H8Ob2Yi2M9wI0/eyYo38QSFoDmswMLfXo6cUwplMARxrYGGYsl2wjFgs+1MQ9GlWdSyd6xgN03DTQagGguujNGUfbboQFj+vR2AXzXrNHBdhT11adzVJj44M6Lm2BXuC03ts2kogC7f9TwyVnuAVo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=avuO+nS6; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=qGVrBtL5; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="avuO+nS6"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="qGVrBtL5" 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 43I3xdDM010638 for ; Thu, 18 Apr 2024 07:10:27 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=4wH4edaMN3tHSvVmGeH17E0vUG+AuvCecVQi/2HAKwk=; b=avuO+nS6JKpMsueuUgzY8B4wcS4WGtVEYJLHAB1YQ8tU/RAb2/x7hHAcAwVmJ8fjT5RC SlP8FjsJxRPZkSMDyGCnXGocdsagWcZfCjd9SHyR+QzY46IodDruWeUCL/XJ8DlyQb9A S0TQqZ9brLc0UgBPCnbPBJoUCAucma84u7CpF0rDZKqlfbg0zo4E9eGzxZUdmbQ36o/z Ea0DN2wjhjYTM1TpWqbaWs/gK175R0Gzrc1gsNY+pphMLtXiLdNEyFH1VSLkI3LPoEEW rsVp7Ckd7iMHkoKImnE6faS96bHRsMnYzR2MtQTbJEJGHa6CeD15+/Cro+HmH0NW7k2C mQ== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xfjkv9k6v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Apr 2024 07:10:27 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 43I6phsG028845 for ; Thu, 18 Apr 2024 07:10:27 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2040.outbound.protection.outlook.com [104.47.66.40]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3xfgg9y834-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 18 Apr 2024 07:10:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XSNsosUlQecdQ/d7UjB7fEe7y57L2gOZlOP7nwV8PbPzE1EQRMw8Z6+sZLqeDRHKOp33mW0hnZRWB2WMuuLpuWeghNM0TGC+tHA+7QW+pj5+zRkmZ16p3kLnXFj6DRUJFdpyY/yjkvYwCZ2A9kymftLS4/17/6mCChpHXhq3zzJf2o48FX3Mq0R+8BUJORl67fVGi67oMe9DNsN8oq3QFXIl/I1wkTlM7qarh1AWJExapG7BRssa2C3qwIROy15NtAHfyZPabRv/eYYEjc3LdRq2cO3IV/he5RAIbzTqyisGKH8uUSOP9kHe+QZZGcaZXDQqg9F7m3RiCOxbIA4xJA== 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=4wH4edaMN3tHSvVmGeH17E0vUG+AuvCecVQi/2HAKwk=; b=W38qaxccR+3BdwKLR44M/XBILk9LzeK4wl0Ew5s6acIsI2Jn3ZvfK9jHl8ktDNxMyW64pVOBwW50XaRYnFGF2PS5RKMNHRwkYiM8dEzsr+ftWlny6xG1ZiAjFwJhM7V/60lOQrAhCJsru5YqpkhlTZlpmsz0QLzlaibT8L1K1ySEUY/XpBV9U5oLTgKJT4R0lnHo4+0dnCzBAFqD7tk35y2EbL/aLLaHosItPKopLmAtcWmW711+9CsBHgTnPqzVERTqBB26n6eWcmzjzHfD3Rr3RtrCJz9JkOoqjL6ilGdUHAdo59KIzNmbVPUEt3F5N3Rdq824csupKG7rsk+OIQ== 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=4wH4edaMN3tHSvVmGeH17E0vUG+AuvCecVQi/2HAKwk=; b=qGVrBtL5Ur474eCyK1NEhXmXjcdGptT+eD52at0uIT5IZs2O2hC97+uppx533BQrGix28qrBTFLRaxWJCCoS517Z/q/aPJxcBQE4qjaY+tuyzsYE35X9Q2PHa56S1F6ZjgBZuwFSduCHX9nMC9bp9RrbXZl/k0hFH4Dp7CzjwHI= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by SA1PR10MB6592.namprd10.prod.outlook.com (2603:10b6:806:2be::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.50; Thu, 18 Apr 2024 07:10:24 +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.7472.037; Thu, 18 Apr 2024 07:10:24 +0000 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: Anand Jain Subject: [PATCH v2 11/11] btrfs: btrfs_drop_subtree optimize return variable Date: Thu, 18 Apr 2024 15:08:43 +0800 Message-ID: X-Mailer: git-send-email 2.42.0 In-Reply-To: References: X-ClientProxiedBy: SI2PR02CA0027.apcprd02.prod.outlook.com (2603:1096:4:195::14) 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_|SA1PR10MB6592:EE_ X-MS-Office365-Filtering-Correlation-Id: 1b4e3c87-ec45-406c-f30b-08dc5f769e48 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qClm8a6EghA4CKopRxT6wpVvI1RSiBi0bw9cWTWYIgqFPAEUf/t4DmGPXLZDnj3oUwWU5mpldpJ3565FfaWdxB8r5HrGd4nf+TZ4U8QxylDThdOKCIqHojoDES77Iv4UdMi9374PY2Z1kM/Cw1w4W8qWFTDdx0hyE8fCf6UGPYVuDtF9Qv1XzdqI8J4NRAvTnuIIOQRM95BUsuQ6+9nORZca1VLnZjS+i+TIZ3NFn7ugts4PZoEr5Xlp8Gx1kX8dr+drsIN0adroZOJTfMbNk03VuPd5GyZdBlqoN89sLU2AY+t8XiEyUZv3iscN/BWyKQMRxrdp5gzNIc5Nrg3LDNw99boKqrlHnGV0/I6f8qn136yi9AXBXUmJsWTYhVbs6QPG/deCwb9egV4jxjG07iWBjnT38hyQPltZR7vk+s55HYFnQ/kxzT5l3YFmFViS1CdaYGNN5cmC5O4K4Oi+sRNQwJKqXW400pNkLWCpX0OvoCiCp6DXjrVRv0CECw2sHg7jrD7QU9AYP5k0ivJVog3UcqVNECv4lK91tMzoCyW7NG8sPIop7F6N282smRQH81pLrB4CqmIIW3RGqe+4QFm30r+mxNzHuiHzVHn0aYMKOhjUdHh9YNInLkUFfxM982QoMO75fmWkjs6DxWU9BRZQweA+Le95O09fqk1hz2E= 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)(366007)(1800799015)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oVFsHrPHg/gQj4SWUjTwGUSdyXnIK/87tQc0ipR6LcRe7DETb94CRjYLoCH7Nh0wXWhIeKsNtES3zl6lajT5SbCQ5t4Hy1bBT3urV3PXrLlQZY8/ctP6QfWsXkKCp30df0QdGP9CuhgfAxt5EHXv7o0xodYj0tlm7jm8/JVn2iHwt65UHTXQufIc4gd68ZE9Ghi51aDS9hj6GBvxi9bwlrcN+CyBH5DFyWnunjnxH/QLMDIMzE2JSs6U19UnR8Qy2Vy/ST0fsHU+5M9A/KE2tcMYph8BldKdEqxDywS+EaBs9cKOHuu+6tfdJBxed6kBoPDy2g3F83fOTPwW8DZy1ZS4Gvyiv/7nCDodPf79LAs3chLr4bhkGjduiH93C9/9I21KP6RAyfoVhEHf1Qo4nLzVWGo9XEL9NJfHhAByw/kcRGW43Y8FO1NmD0ViDaOCyovP22r3gL6gHq6asurba/13RqPCZvJLbI54s2HjCBml4whDB++BgPRK6CCIVNdUqQ9VZTTH+QZyGFEYUWgB+776qZQFEueaAqUTvCn3L2ZHRSbf30BtZrmT2IKQhJnTJvvzo9bvlPZ8JfphaNrawjHcCICS7xLa7PtCq5MBD9WFSHQ5C8c7ikMQoTWzVlO77o0qOxWa73UbpCxV0ZBmgS7w+r+IVXrBTLSyUyS4GCJe3NUCfbKln6jRyHTgLyHXcONZX/Xam/J07Q6/eSpfQh0F5Dx1rDGvbm0iRt9qmEpGMvjAu/cGWeFIheur4AQOsNh6P2bAL+5PcmMVvSyjvSAUIdgmlbsEP4harSQB+g0krS4l9VahY+/Gm29fFBj0D1Hgd5XZk93eSc+seGRIB3taffcAnD8CL8cEGn55kZt2E3mRJjU8qUjhByzNqxt7FTkA5OIOjORKCNXPELnsmJG6qquAVv6zVRfcHvg+AzPwWkAYdA0nUEoq+gUfJB2uPJuFpZCXyfE75pJN3QWVJgQk3LW1OJFeGzeR7tdVNdjSbSTd+tRZg1h/HJJ4vUMbf1FlTjacM89abPaM0mkEA70JPvsFQriDKy9G9itPmP/NeayWU1mD0I47fnDm7dWzMapqkMDqcfnhaKM1HXcikHgeUOsSMsMTFCZRlLtTnNXuH+3Yq5XUWWlU7tduwjhVWmb4/ufA0ewsI5uiuYRk21l2z9VqHXyClSLkfkuNBZLanAw1//gDtfNrZAHfNWlkjqRKltxgUXNCELhLOqsCFPpAuVereSOb4T5j38OKpRCxvg8ATqIyYdOMtdVDZ2RH4njydEg5H/AzUguurWgUed89pqhLU695f5DToa+3YXdyV+GCYGKJrdEGmpmbppyN9nuSSNiu005juabUtLmiVwxctD905x37g9l5IRfHYzqh4jzajtwim7pf3NADtv5bQIXZkcWuCrj6SwKTVL7UKOSJXrUCfBVsM5ymM3F0MlC8/x2R17Sb0SuxVqmECpL+7pJZjcVJY2xky9ewnY71k+KKxqD6QUtR6RD6XTzdi04ZBDcktY/KVe/eqn3gUZbV8UeEMEj2iKUgLXBKbjO+1R+DVZNKOpIMHNWr/xXE+Nr6igIjW/geFt87GbXyPq8E X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: YNgBmSERILNPc25/5MDlfUggg0loupfslFlNxXGP+Auy4lETzUbQNZjKV4jBFjSVUoFP92JAqCS2plr7nlwlLF4v7U/G+f/9HoPkviNzdMOIDEogXm2sCeErLLuVvdzkxcPqVUcR1KRyL3tGTm+fDI1JcSvYZVIKX1+JXNTtZBAZovtCXZ5pOfXqQTNZERr7AxCWfuCP2hpWmSmQV6vo/YC1ABO7oZNC+oL/efzwk+J1Ay4EMgh42GkrmhZdoEeguwio1qzXXgKVSDQIk1BWpgtFp1F7PfqNKPo0yUFQJrMEz0iG8Lt9kO0cYAYHYljndyNn7lpTgGL0JNXxzZ7qdOC+MjnOgf8Ev1PymVmm1V9IG4oLEWxw1LGR4BImfUpd2cDNcUa3isRd8rEXNqJrHlgMmz3HjHCvpOWfPDCI7U24cqXIkdsAP2F048PetMbn+Xqd+Dig4ocKxgu5Cn+1Uv663pBloExt5AOhfHW1XE2VjqxUXIs9ieFKVoABoNUpYMMddN0iDkG983uKGy+u2irreQfQvkBRj2RLSMVFtRc2hA3xsccWtC4CG02i83Xe/WN0HTWE9v8fLggCMT+ndkjO6HH/f9Zmy1XOun2a96E= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1b4e3c87-ec45-406c-f30b-08dc5f769e48 X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 07:10:24.8690 (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: g9AouIPmWdtiL3WNF03CTZ0+OajhySGVENXV6aLeScvtnMHlHFS0+3hTFGAo2kuJrQTx0bttPBmP1jYfcQzamQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6592 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-04-18_05,2024-04-17_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 mlxlogscore=999 mlxscore=0 adultscore=0 phishscore=0 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404180049 X-Proofpoint-ORIG-GUID: i_d2mUUKUO2Rrukrgwz_1LSeXceBGDJa X-Proofpoint-GUID: i_d2mUUKUO2Rrukrgwz_1LSeXceBGDJa retw is a helper return variable used to update the actual return value ret. Instead, just use ret. Signed-off-by: Anand Jain --- v2: rework walk_up_tree() returned error, leading unusing wret. (Josef). fs/btrfs/extent-tree.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 17aa45b906bb..2d0c03806d80 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -6099,7 +6099,6 @@ int btrfs_drop_subtree(struct btrfs_trans_handle *trans, int level; int parent_level; int ret = 0; - int wret; BUG_ON(btrfs_root_id(root) != BTRFS_TREE_RELOC_OBJECTID); @@ -6135,17 +6134,16 @@ int btrfs_drop_subtree(struct btrfs_trans_handle *trans, wc->reada_count = BTRFS_NODEPTRS_PER_BLOCK(fs_info); while (1) { - wret = walk_down_tree(trans, root, path, wc); - if (wret < 0) { - ret = wret; + ret = walk_down_tree(trans, root, path, wc); + if (ret < 0) break; - } - wret = walk_up_tree(trans, root, path, wc, parent_level); - if (wret < 0) - ret = wret; - if (wret != 0) + ret = walk_up_tree(trans, root, path, wc, parent_level); + if (ret) { + if (ret > 0) + ret = 0; break; + } } kfree(wc);