The patch titled
Subject: mm/filemap.c: remove else after a return
has been added to the -mm tree. Its filename is
mm-remove-the-unuseful-else-after-a-return.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/mm-remove-the-unuseful-else-after-a-return.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/mm-remove-the-unuseful-else-after-a-return.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Hailong Liu <carver4lio@xxxxxxx>
Subject: mm/filemap.c: remove else after a return
The `else' is not useful after a `return' in __lock_page_or_retry().
Link: https://lkml.kernel.org/r/20201202154720.115162-1-carver4lio@xxxxxxx
Signed-off-by: Hailong Liu<liu.hailong6@xxxxxxxxxx>
Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/filemap.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
--- a/mm/filemap.c~mm-remove-the-unuseful-else-after-a-return
+++ a/mm/filemap.c
@@ -1583,19 +1583,19 @@ int __lock_page_or_retry(struct page *pa
else
wait_on_page_locked(page);
return 0;
- } else {
- if (flags & FAULT_FLAG_KILLABLE) {
- int ret;
-
- ret = __lock_page_killable(page);
- if (ret) {
- mmap_read_unlock(mm);
- return 0;
- }
- } else
- __lock_page(page);
- return 1;
}
+ if (flags & FAULT_FLAG_KILLABLE) {
+ int ret;
+
+ ret = __lock_page_killable(page);
+ if (ret) {
+ mmap_read_unlock(mm);
+ return 0;
+ }
+ } else
+ __lock_page(page);
+ return 1;
+
}
/**
_
Patches currently in -mm which might be from carver4lio@xxxxxxx are
mm-remove-the-unuseful-else-after-a-return.patch
