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(). [akpm@xxxxxxxxxxxxxxxxxxxx: coding style fixes] 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 | 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; + } /** _
