mm/filemap.c: remove else after a return

[sfrench/cifs-2.6.git] / mm / filemap.c

diff --git a/mm/filemap.c b/mm/filemap.c
index b31e232fdd459b53b929aad02ad8c3dd28a4a765..343ba8571ff957dce77d4284762f52f82d51cf1f 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1583,19 +1583,20 @@ int __lock_page_or_retry(struct page *page, struct mm_struct *mm,
                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;
+
 }
 
 /**