* [merged] mm-remove-the-unuseful-else-after-a-return.patch removed from -mm tree
@ 2020-12-15 23:17 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2020-12-15 23:17 UTC (permalink / raw)
To: akpm, carver4lio, liu.hailong6, mm-commits
The patch titled
Subject: mm/filemap.c: remove else after a return
has been removed from the -mm tree. Its filename was
mm-remove-the-unuseful-else-after-a-return.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Hailong Liu <carver4lio@163.com>
Subject: mm/filemap.c: remove else after a return
The `else' is not useful after a `return' in __lock_page_or_retry().
[akpm@linux-foundation.org: coding style fixes]
Link: https://lkml.kernel.org/r/20201202154720.115162-1-carver4lio@163.com
Signed-off-by: Hailong Liu<liu.hailong6@zte.com.cn>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/filemap.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
--- a/mm/filemap.c~mm-remove-the-unuseful-else-after-a-return
+++ a/mm/filemap.c
@@ -1583,19 +1583,20 @@ int __lock_page_or_retry(struct page *pa
else
wait_on_page_locked(page);
return 0;
- } else {
- if (flags & FAULT_FLAG_KILLABLE) {
- int ret;
+ }
+ 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;
+ 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@163.com are
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-12-16 0:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-15 23:17 [merged] mm-remove-the-unuseful-else-after-a-return.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.