mm/z3fold.c: remove useless code in z3fold_page_isolate

PATCH In review Gustavo A. R. Silva 2 participants 2 messages Aug 29, 2019 – Aug 30, 2019 Memory management

lore

Share & tools

lore

Gustavo A. R. Silva

author

2019-08-29 19:13 UTC #0 lore raw

PATCH 1/1 mm/z3fold.c: remove useless code in z3fold_page_isolate

Remove duplicate and useless code.

Reported-by Andrew Morton <[email protected]>

Signed-off-by Gustavo A. R. Silva <[email protected]>

---
 mm/z3fold.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

mm/z3fold.c +2 -4

index 75b7962439ff..044b7075d0ba 100644
@@ -1400,15 +1400,13 @@ static bool z3fold_page_isolate(struct page *page, isolate_mode_t mode)
 			 * can call the release logic.
 			 */
 			if (unlikely(kref_put(&zhdr->refcount,
-					      release_z3fold_page_locked))) {
+					      release_z3fold_page_locked)))
 				/*
 				 * If we get here we have kref problems, so we
 				 * should freak out.
 				 */
 				WARN(1, "Z3fold is experiencing kref problems\n");
-				z3fold_page_unlock(zhdr);
-				return false;
-			}
+
 			z3fold_page_unlock(zhdr);
 			return false;
 		}

Signature · 1 line

2.23.0

Andrew Morton

maintainer

2019-08-30 01:37 UTC #1 lore raw

Quoted 14 lines · On Thu, 29 Aug 2019 14:13:12 -0500 "Gustavo A. R. Silva"…

Remove duplicate and useless code.

...

mm/z3fold.c +1 -1

@@ -1400,15 +1400,13 @@ static bool z3fold_page_isolate(struct page *page, isolate_mode_t mode)
 			 * can call the release logic.
 			 */
 			if (unlikely(kref_put(&zhdr->refcount,
-					      release_z3fold_page_locked))) {
+					      release_z3fold_page_locked)))
 				/*
 				 * If we get here we have kref problems, so we

mm/z3fold.c static bool z3fold_page_isolate(struct page *page, isolate_mode_t mode) · line 1412

Quoted 10 lines

mm/z3fold.c +1 -3

 				 * should freak out.
 				 */
 				WARN(1, "Z3fold is experiencing kref problems\n");
-				z3fold_page_unlock(zhdr);
-				return false;
-			}
+
 			z3fold_page_unlock(zhdr);
 			return false;
 		}

Thanks.

We prefer to retain the braces around a code block which is more than a single line - it's easier on the eyes.

mm/z3fold.c renamed from mm/z3fold.c~mm-z3foldc-remove-useless-code-in-z3fold_page_isolate-fix +2 -2

@@ -1400,13 +1400,13 @@ static bool z3fold_page_isolate(struct p
 			 * can call the release logic.
 			 */
 			if (unlikely(kref_put(&zhdr->refcount,
-					      release_z3fold_page_locked)))
+					      release_z3fold_page_locked))) {
 				/*
 				 * If we get here we have kref problems, so we
 				 * should freak out.
 				 */
 				WARN(1, "Z3fold is experiencing kref problems\n");
-
+			}
 			z3fold_page_unlock(zhdr);
 			return false;
 		}