lkml.org 
[lkml]   [2014]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH 4/6] btrfs: don't check the cleancache for swapcache pages
    Date
    Signed-off-by: Omar Sandoval <osandov@osandov.com>
    ---
    fs/btrfs/extent_io.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
    index 54b2d00..b8dc256 100644
    --- a/fs/btrfs/extent_io.c
    +++ b/fs/btrfs/extent_io.c
    @@ -2904,13 +2904,14 @@ static int __do_readpage(struct extent_io_tree *tree,
    size_t disk_io_size;
    size_t blocksize = inode->i_sb->s_blocksize;
    unsigned long this_bio_flag = *bio_flags & EXTENT_BIO_PARENT_LOCKED;
    + int swapcache = PageSwapCache(page);

    - if (likely(!PageSwapCache(page)))
    + if (likely(!swapcache))
    set_page_extent_mapped(page);

    end = page_end;
    if (!PageUptodate(page)) {
    - if (cleancache_get_page(page) == 0) {
    + if (likely(!swapcache) && cleancache_get_page(page) == 0) {
    BUG_ON(blocksize != PAGE_SIZE);
    unlock_extent(tree, start, end);
    goto out;
    --
    2.1.3


    \
     
     \ /
      Last update: 2014-11-17 12:21    [W:3.765 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site