ACPI / PM: Do not disable wakeup GPEs that have not been enabled

[firefly-linux-kernel-4.4.55.git] / fs / gfs2 / meta_io.c

diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
index 2cf09b63a6b4433a2f35095b53a8141325f1bb5f..b984a6e190bc2f6b5d447fd8a4a5e7ab740d7905 100644 (file)
--- a/fs/gfs2/meta_io.c
+++ b/fs/gfs2/meta_io.c
@@ -136,7 +136,8 @@ struct buffer_head *gfs2_getbuf(struct gfs2_glock *gl, u64 blkno, int create)
                        yield();
                }
        } else {
-               page = find_lock_page(mapping, index);
+               page = find_get_page_flags(mapping, index,
+                                               FGP_LOCK|FGP_ACCESSED);
                if (!page)
                        return NULL;
        }
@@ -153,7 +154,6 @@ struct buffer_head *gfs2_getbuf(struct gfs2_glock *gl, u64 blkno, int create)
                map_bh(bh, sdp->sd_vfs, blkno);
 
        unlock_page(page);
-       mark_page_accessed(page);
        page_cache_release(page);
 
        return bh;