From patchwork Tue Mar 11 08:13:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sun YangKai X-Patchwork-Id: 14011265 Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 785CF1E32DB for ; Tue, 11 Mar 2025 08:13:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741680829; cv=none; b=SyQtqnT7Gm6BrYHN8KElhFGkeDewkOlnhmOa/Id4IarHuaD6qJjzNii/n/YwEYNJwLos94DwUfTVXEEwb5q92MiSCmP/3+KQZHJ9Khaj1Nm20xMJHnMeehyHcOL7XpWUB4QCZZTmR5WL2Hf+vyKB50RePxizDOhbdFcZLFfuEmQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741680829; c=relaxed/simple; bh=cHC+BguhzMGWYnga3bnKS8YCrhT9Z7to7R4FqFIK+ug=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CRyhdTXQyG35sszAEJmbvrtrCgBtIO5N4nMpuVOV8PifPvcmlv5B8szL2DGN+Qiy0GkupZjfKMLEUzgkJekFgH5OjUvQcUGvtMvA6U1JC0q4SWWNl4RvP5tToQnuXd+J4EDMokNJcQMb0ZW2lMJdJfyw1CvKV+Wxb/mgt8p5QQc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kvJVA+Ej; arc=none smtp.client-ip=209.85.214.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kvJVA+Ej" Received: by mail-pl1-f194.google.com with SMTP id d9443c01a7336-21f8f3bd828so8939195ad.2 for ; Tue, 11 Mar 2025 01:13:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741680827; x=1742285627; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0DYXgPFTGeFHRK2gpJRR2tyVYVqDrLbyU27Ojr815Bk=; b=kvJVA+Ej3F98fK5xPkJqf7l/LIsZXRRTf8J8t6e8yLtpJeRehPIrW1jcLqI8RatqiO 2JMLTxV5CC3BDtz5gqSHIjQTA4wudbcoBQx5ilGetLJ4U23WnFh08m5QRdl8INEJuTsE pXhibPkSZzID3Z5eSt9UPs66tlsvN3FHBMRxZsV9GG2vLuL5fk938q5SPF3VvKqQf9bk UCTQDfxbdaxv38JKojdLmlnO4sq5y3aOOmM/+a1ekU35mEkh5IJqid4fpbrLPlt47LoW UhrkSGxTyqCdninpX+YWwn8W29ezCa7gZu8O9Iq6Kr0HI794k/eDbShCpTqXYI0LRJLr 32HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741680827; x=1742285627; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0DYXgPFTGeFHRK2gpJRR2tyVYVqDrLbyU27Ojr815Bk=; b=DA3XNa0sTWdaR/+iZMWOfOuSYnf2dCcacd4k3ToYsVRM46Ydnsy+u397/XIX3oHnZN WRdLll+6lBm7hi6Q8YTGWygWm/70h9QhHll2ax7Ateoqjzxdx1n24Pt8bbB6PagvzLtz tIwQVU7we3RK6WkTyswPgEGKs9ZcHEdhgoge1GpKtyX01QOZRArvmtsG1a9/qnE1uhnf C6U2sSc3ByJyhvxzMoFaCZjp3bjsr9tCdmBGNDR50VCzvB5y6BE1DYzS9xhALxxn2Lq4 cCVEI+iv9dWbsLsvjUwJzw/CldR+D5fDJl6A3ACgSe15gr8OGUEKHWEj2oHAhwuTpEfw nJOQ== X-Gm-Message-State: AOJu0Ywhpb2HY3qd7xSs0in+HMIqFbGTut7tvUMrStSz9vAN0Atpn6Ze +9fI5zsweHECO3WFvrWt/m3URROdR8tJkcq6S8FmG3oHCwh9SK8eyGCMP+KLQxYl1Q== X-Gm-Gg: ASbGncukRjs7RnuvPHgCPqtIRIX7GjNhK2DpwzdcnZyT+J5kkTmWHGtkHQM9H3/I8/u 2SlcgZTt/Fnaz9Al9NM6xQ+j+53tH6UtrcKxdRj4aprM/OxLHhFAwDcM+i3WNhQMU07tuxhpXVV fBhARKd6kzGq9rUro9IEPRXl0diqszskeiz5Hb+HCFyyuAJj/gqq40ZtnkLSM9TQaGiNm3WmMjG tsWwuH8Cf2I+yye7l0ch7KtvRapPH4EoI5fKn7v5TT/ayKHgLFSQVKiiX2XHXCeL5c3esjjrVMS qszLZN1+vL/kXzGQUY+6J0gTePQLYKYuMnlZNQboDpbKj98= X-Google-Smtp-Source: AGHT+IHGf2WZv2sT6HR3hS3lBxcyTjpT7kYkgvUCXPH2S5JRHarayfR4KcIEdJPxrWNDyI1pwEpUPA== X-Received: by 2002:a17:902:d48d:b0:220:e98e:4f17 with SMTP id d9443c01a7336-22541ea9638mr69207655ad.2.1741680827418; Tue, 11 Mar 2025 01:13:47 -0700 (PDT) Received: from SaltyKitkat.. ([198.176.54.118]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22410aa5cdbsm91203635ad.230.2025.03.11.01.13.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 01:13:47 -0700 (PDT) From: Sun YangKai To: linux-btrfs@vger.kernel.org Cc: David Sterba , Sun YangKai Subject: [PATCH v2 1/3] btrfs: simplify the return value handling in search_ioctl() Date: Tue, 11 Mar 2025 16:13:12 +0800 Message-ID: <20250311081317.13860-2-sunk67188@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250311081317.13860-1-sunk67188@gmail.com> References: <20250311081317.13860-1-sunk67188@gmail.com> Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 1. Move the assignment of ret = -EFAULT to within the error condition check in fault_in_subpage_writeable(). The previous placement outside the condition could lead to the error value being overwritten by subsequent assignments, cause unnecessary assignments. 2. Simplify loop exit logic by removing redundant `goto`. The original code used `goto err` to bypass post-loop processing after handling errors from `btrfs_search_forward()`. However, the loop's termination naturally falls through to the post-loop section, which already handles `ret` values. Replacing `goto err` with `break` eliminates redundant control flow, consolidates error handling, and makes the loop's exit conditions explicit. The changes ensure proper error propagation and make the loop's exit conditions clearer while maintaining functional equivalence. Signed-off-by: Sun YangKai --- fs/btrfs/ioctl.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 6c18bad53cd3..bef158a1260b 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -1642,21 +1642,20 @@ static noinline int search_ioctl(struct inode *inode, key.offset = sk->min_offset; while (1) { - ret = -EFAULT; /* * Ensure that the whole user buffer is faulted in at sub-page * granularity, otherwise the loop may live-lock. */ if (fault_in_subpage_writeable(ubuf + sk_offset, - *buf_size - sk_offset)) + *buf_size - sk_offset)) { + ret = -EFAULT; break; + } ret = btrfs_search_forward(root, &key, path, sk->min_transid); - if (ret != 0) { - if (ret > 0) - ret = 0; - goto err; - } + if (ret) + break; + ret = copy_to_sk(path, &key, sk, buf_size, ubuf, &sk_offset, &num_found); btrfs_release_path(path); @@ -1666,7 +1665,7 @@ static noinline int search_ioctl(struct inode *inode, } if (ret > 0) ret = 0; -err: + sk->nr_items = num_found; btrfs_put_root(root); btrfs_free_path(path); From patchwork Tue Mar 11 08:13:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sun YangKai X-Patchwork-Id: 14011266 Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 88A9C22424D for ; Tue, 11 Mar 2025 08:13:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.66 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741680832; cv=none; b=eb5ZGN9OyvjgXQFjGMoBgU5JDd47MZBJ9EwpnasgBHfp4TQ7dn/L2+b+u8Y+uLp08C9TGDw+ypx3L+o/Cv18FCAdyOxtAOBmdjptZ2KYKAn11XT57/dWcQnnMtgkZucYrsGEneoZVes1Wf6a+D9ptuNNCOVfmVRl25cs2R0SrVE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741680832; c=relaxed/simple; bh=azmgcxDlEMkbz/7g7z29i1xHMvyruUTz9bJ+3ND+MH4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QKgnJ7E+IA8WBsMy19Uon2Opf6Cw94TO8mKL3oUfr3FLsLM547tbI3INE0yXR2+xJUa9k/ZkB70hzFhJFqNUmuVNzV6m4hyWkwAcVhTeIaX1Ky5MhVU+HBeZmBxWV4NMRTgkv82jVCiWpiGWkoWHX6O3ECc/BA7BQojfGfC5fU4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=itGqkTO0; arc=none smtp.client-ip=209.85.216.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="itGqkTO0" Received: by mail-pj1-f66.google.com with SMTP id 98e67ed59e1d1-2ff6ce72844so1298619a91.2 for ; Tue, 11 Mar 2025 01:13:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741680830; x=1742285630; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yGvsEwl+QgfiYAvu22GsPUjaCyd2Fecud6lvlrtcaCM=; b=itGqkTO0NKwjwNIRIQyUd37frWjVI4kp/XEAoqRymL9oalj3UqrEKilN2uKzpLRn8S /8DLyP1KQKk9jMCRewiNb13IQG9e31BKJAyRW0+N3fI+3MZbCGwny1bZUsbGcfU15nWD pMnSk5vBPB96XZGCyjkmP39vXXZjYryRm04CtOZY0Jcrun+Ag7Y0KlPBhOQYml25vvAe vJRedzIYjKoAKLF+yuVNLGyqEFk9hfSuwx+RnnNkkgf24wXwVfUQgliGtrNblCeo4c5a /OnJVYaV5dZtVV3sVjEsCZ9NT1C1MhnG0XRQOArEVu9k1CbAhd+2iGNf7eBnvT+KLJa8 j2tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741680830; x=1742285630; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yGvsEwl+QgfiYAvu22GsPUjaCyd2Fecud6lvlrtcaCM=; b=OBUGxBnDuP0W5M4izrEjid4xMi36Fdu/eF3N4oS6VBmrCiuJowRQdTYntdINI42Q10 B7I9fDP3qE9ZjGmKsnSadB5GY7ky4bA9K0S2KUmLpHL4nFkEwORAVWE1WOxAhD7RQPTh m6af6IGWQBlUjzzogvm9PwEf2ZDRrRR5uVQA86RrH/PqB3Ajulei9u03C3kV1+XXx0/r B6jGGNVN0BDG5TJXbiiaUL3TJCFfhynWylQQUPM790O8VhMl+sq0tarQdq2xxgS7cX5w oxX7uue6d9A1jYKrgBT+6mhdEx9oF5N7ntBzuR9QRMKz66NA0fR3SATYkmFINMSI+MLv +Rdw== X-Gm-Message-State: AOJu0Ywltqha0RzkzbiMUWCKtsPRNpt4pmBkDgZAC3/R50ZFkdhKoweC T3ED1Rx1vOP/hBv2IWpy6Lz2EJkX6ReqOa7VRlMLJVtpzuXTCtmatFOllr4d1Geljg== X-Gm-Gg: ASbGncsjKMSA52rIWY5qLFcqRT9dXkoIT4rdT6DePx3cBcxo9RE/IVBVNM+hFpYtK8s f3oGqPtHLMpWFXJR6BxGbIdqqJHkgdYQbDOE4XG5OqvpmUUIW1eNnfkkMyeDNb9DZ5JdZzHMdct vpJfNXwSqTAM+kszog+aUNZR3gluGJ4O3jlNYajv5T1yqWpjPNit13JeIS/alQt/NAxBNV3C6kS jCT51Rw7lDGqbR3i2bRwOnbmuTPC85S8alm2UBt0UsOBj6vsXQXVDRuRapT0kkmvniVO+jTO4On xxJ1Wao5ZLGBN293R5YvNbUU7TCMBJHdHcr8fyFVoFYyhGY= X-Google-Smtp-Source: AGHT+IHgpJRCHa4+VNLUYF2HGmwJTNHOmUSqmasmhf1QEP+CExTo3tJU20UlLjyP5qxLWM51fgfYEA== X-Received: by 2002:a17:90b:1a90:b0:2ff:682b:b754 with SMTP id 98e67ed59e1d1-300a2b70cb9mr6774469a91.2.1741680830406; Tue, 11 Mar 2025 01:13:50 -0700 (PDT) Received: from SaltyKitkat.. ([198.176.54.118]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22410aa5cdbsm91203635ad.230.2025.03.11.01.13.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 01:13:50 -0700 (PDT) From: Sun YangKai To: linux-btrfs@vger.kernel.org Cc: David Sterba , Sun YangKai Subject: [PATCH v2 2/3] btrfs: remove the unnecessary local variable in btrfs_search_forward() Date: Tue, 11 Mar 2025 16:13:13 +0800 Message-ID: <20250311081317.13860-3-sunk67188@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250311081317.13860-1-sunk67188@gmail.com> References: <20250311081317.13860-1-sunk67188@gmail.com> Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The 'found_key' variable was only used to temporarily store the found key before copying it to 'min_key' at the end of the function when returning success (ret=0). So eliminating the 'found_key' variable, and directly store the key into 'min_key' at the exact loop exit points where ret=0 is set, maintaining identical functionality. Signed-off-by: Sun YangKai --- fs/btrfs/ctree.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 3dc5a35dd19b..5f7c937b0f4d 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -4608,7 +4608,6 @@ int btrfs_search_forward(struct btrfs_root *root, struct btrfs_key *min_key, u64 min_trans) { struct extent_buffer *cur; - struct btrfs_key found_key; int slot; int sret; u32 nritems; @@ -4644,7 +4643,8 @@ int btrfs_search_forward(struct btrfs_root *root, struct btrfs_key *min_key, goto find_next_key; ret = 0; path->slots[level] = slot; - btrfs_item_key_to_cpu(cur, &found_key, slot); + /* Save our key for returning back. */ + btrfs_item_key_to_cpu(cur, min_key, slot); goto out; } if (sret && slot > 0) @@ -4679,11 +4679,11 @@ int btrfs_search_forward(struct btrfs_root *root, struct btrfs_key *min_key, goto out; } } - /* save our key for returning back */ - btrfs_node_key_to_cpu(cur, &found_key, slot); path->slots[level] = slot; if (level == path->lowest_level) { ret = 0; + /* Save our key for returning back. */ + btrfs_node_key_to_cpu(cur, min_key, slot); goto out; } cur = btrfs_read_node_slot(cur, slot); @@ -4700,10 +4700,8 @@ int btrfs_search_forward(struct btrfs_root *root, struct btrfs_key *min_key, } out: path->keep_locks = keep_locks; - if (ret == 0) { + if (ret == 0) btrfs_unlock_up_safe(path, path->lowest_level + 1); - memcpy(min_key, &found_key, sizeof(found_key)); - } return ret; } From patchwork Tue Mar 11 08:13:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sun YangKai X-Patchwork-Id: 14011267 Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4F5471E832A for ; Tue, 11 Mar 2025 08:13:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.68 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741680836; cv=none; b=cQEroxyNvuwMsXUDWbyKj5VK9QKiiQWz+eX13HVTA5SL6Z5x/A1uhBcDRKwkOewg9nsIY3o36U+V7dyQPVb+ZhAowYoAK91w9qKVapPxNCaX9tCPno/+KODKTq6xoWSAvd2NIjdh27BNhrIhMd5RK5jjpEZwln4l42ctV4NaSRM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741680836; c=relaxed/simple; bh=uH6+ZQAnJ7kdEAC4hIA/V5DAngBGxPaoUdHNBL3Mbyg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z03StSzggLz1NKAFy6asr8nh3ubIgtjid5NoTkiqbQlKX7HpPrgBjdi9puJFLo7+1nuAmJ4lYrDbvX+mOkQ+SdEwMF0eXz5Ir750cmKgMOnsCtqGN0g/H0jta2QbVAgy/wCivNEG6DQhRih41WxGRjwki/PrTeqrB++LYi5gFCM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=TL3NW72f; arc=none smtp.client-ip=209.85.216.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TL3NW72f" Received: by mail-pj1-f68.google.com with SMTP id 98e67ed59e1d1-2ff6ce72844so1298626a91.2 for ; Tue, 11 Mar 2025 01:13:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741680833; x=1742285633; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MwJ/109U/n0Sv/yg42g0BTFRceKEmZB90J6nZMQ0RQw=; b=TL3NW72fS1bAh5kLsApx1jNuLhQ7eOJXPfEp9X5ulyFtnThcAqZQiJKtHTfz1L5M8z O5rjdQKsS3iuMHi3iEr9IYxLfaOgJMxeS1BeFVNo9SDDUiIP19gSpAujYc0++JtTurRf u14WXs+slCChxl22O1RZD+abo9ZbMGAX5/Xi0fJC6E+hZulQMztcVJP/xSEVqWGWVG4S 26SRQMTocLfdpY7gNIAJesvK6UXV2RRoX0nEEMm11aFU0T91YewyphS185obCA2kkkMX kNRWKlZruVX6fHMTzeAmD8W0S3kjGbzaVfx2KTwgsWNvTwEV+7n8v8Ln0yQ6y/mNK2Xu Im9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741680833; x=1742285633; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MwJ/109U/n0Sv/yg42g0BTFRceKEmZB90J6nZMQ0RQw=; b=EygJ9AkAMbZnoBru0uw7ePBXf/1Faa4qE0bAoDGX527VtKCkY6CW2Zn4XR0KXaIgGN X+AFckS3Q1cAzvGSEG2XZkHlHZIfIG/BDL2O+7EO7uYmtqLG4OlA7ToBLiA6Y/bqBk1z dYW0DE8KKplWGqyCAAh60Vs83ogO7lAap75kAxn9IMYYtyBhjLHcmyCzKmO2xJ8jZPBA 7uRDvTpb98RkxbptCDSN3kr1b6fjWnT8Ny8k+UNPMqJ14Tydl76pkwSBPnq11MeTSOBe /HCm/lxStSjzQ4D/6Fre2KE6jZ8msfkh6clVSGoei7hMyYXNSLbiUy2PqpQmIFh67OoY PWYg== X-Gm-Message-State: AOJu0YyB/shX41lvPOgK9AeM8+ZY3nujOBZJYAud4yZuF/CeFs5M66XJ VDMYdmTHzQAPpAdX3OimAgswRqS50MtLdpFILNaLsNqP0lD/HzXjst2+tv079gv7XQ== X-Gm-Gg: ASbGncspbUio2j/p/B3hw1dbUxVa36TZfGqzK+PaMdt7qzgcwBwAftek6+pYExECp9C P6DLTtOzGrwV/6LQEM0uvTMKeq9zTEooeB1FpyUKkeFkX2JTNyMEX2SYqcgmWcUP8fTWvo65iBh JH/f/dj4tUIK0nXiCDWGVaqEt9ZM+hMLuKDrgO3JUjGjc29DUOFelbIt4ZP2CAO7Ef+HMwg19Yq TeNjFZeGDv10njCX5MuhWxkNWU0Zx7jFNC1zb0B/VN4/y1ZTTfmRDK1RQ9MopqRA9hOBnsuuMRT pol85t/CbDCT8rNZl8tg5MIO/vzlJvBOKn0G6D5QIZ7INAo= X-Google-Smtp-Source: AGHT+IHh0bTYZXBcP9pXRYqTsskPCbDYnw9wjVZyhC+vstbxyr3C2n31aHu7a8MGYEL1FBp1J8nXaA== X-Received: by 2002:a17:90b:2241:b0:2fe:b77a:2eba with SMTP id 98e67ed59e1d1-300a2b6fb91mr7085668a91.1.1741680833399; Tue, 11 Mar 2025 01:13:53 -0700 (PDT) Received: from SaltyKitkat.. ([198.176.54.118]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22410aa5cdbsm91203635ad.230.2025.03.11.01.13.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 01:13:53 -0700 (PDT) From: Sun YangKai To: linux-btrfs@vger.kernel.org Cc: David Sterba , Sun YangKai Subject: [PATCH v2 3/3] btrfs: avoid redundant slot assignment in btrfs_search_forward() Date: Tue, 11 Mar 2025 16:13:14 +0800 Message-ID: <20250311081317.13860-4-sunk67188@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250311081317.13860-1-sunk67188@gmail.com> References: <20250311081317.13860-1-sunk67188@gmail.com> Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Moving `path->slots[level] = slot` before the condition check to prevent duplicate assignment. Previously, the slot was set both inside and after the `slot >= nritems` block with no change in its value, which is unnecessary. Signed-off-by: Sun YangKai --- fs/btrfs/ctree.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 5f7c937b0f4d..c982960d8a91 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -4668,8 +4668,8 @@ int btrfs_search_forward(struct btrfs_root *root, struct btrfs_key *min_key, * we didn't find a candidate key in this node, walk forward * and find another one */ + path->slots[level] = slot; if (slot >= nritems) { - path->slots[level] = slot; sret = btrfs_find_next_key(root, path, min_key, level, min_trans); if (sret == 0) { @@ -4679,7 +4679,6 @@ int btrfs_search_forward(struct btrfs_root *root, struct btrfs_key *min_key, goto out; } } - path->slots[level] = slot; if (level == path->lowest_level) { ret = 0; /* Save our key for returning back. */