ALSA: hda - restore BCLK M/N values when resuming HSW/BDW display controller

[deliverable/linux.git] / fs / buffer.c

diff --git a/fs/buffer.c b/fs/buffer.c
index 0d3e8d5a2299127a336d788a19646f9bf9dd86c1..eba6e4f621ce0946ddccb250103656654c0844ee 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -227,7 +227,7 @@ __find_get_block_slow(struct block_device *bdev, sector_t block)
        int all_mapped = 1;
 
        index = block >> (PAGE_CACHE_SHIFT - bd_inode->i_blkbits);
-       page = find_get_page(bd_mapping, index);
+       page = find_get_page_flags(bd_mapping, index, FGP_ACCESSED);
        if (!page)
                goto out;
 
@@ -1366,12 +1366,13 @@ __find_get_block(struct block_device *bdev, sector_t block, unsigned size)
        struct buffer_head *bh = lookup_bh_lru(bdev, block, size);
 
        if (bh == NULL) {
+               /* __find_get_block_slow will mark the page accessed */
                bh = __find_get_block_slow(bdev, block);
                if (bh)
                        bh_lru_install(bh);
-       }
-       if (bh)
+       } else
                touch_buffer(bh);
+
        return bh;
 }
 EXPORT_SYMBOL(__find_get_block);