lkml.org 
[lkml]   [2013]   [Apr]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 03/18] ext4: use ->invalidatepage() length argument
    Date
    ->invalidatepage() aop now accepts range to invalidate so we can make
    use of it in all ext4 invalidatepage routines.

    Signed-off-by: Lukas Czerner <lczerner@redhat.com>
    ---
    fs/ext4/inode.c | 30 +++++++++++++++++++-----------
    include/trace/events/ext4.h | 22 ++++++++++++----------
    2 files changed, 31 insertions(+), 21 deletions(-)

    diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
    index 69595f5..f80e0c3 100644
    --- a/fs/ext4/inode.c
    +++ b/fs/ext4/inode.c
    @@ -1411,21 +1411,28 @@ static void ext4_da_release_space(struct inode *inode, int to_free)
    }

    static void ext4_da_page_release_reservation(struct page *page,
    - unsigned long offset)
    + unsigned int offset,
    + unsigned int length)
    {
    int to_release = 0;
    struct buffer_head *head, *bh;
    unsigned int curr_off = 0;
    struct inode *inode = page->mapping->host;
    struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
    + unsigned int stop = offset + length;
    int num_clusters;
    ext4_fsblk_t lblk;

    + BUG_ON(stop > PAGE_CACHE_SIZE || stop < length);
    +
    head = page_buffers(page);
    bh = head;
    do {
    unsigned int next_off = curr_off + bh->b_size;

    + if (next_off > stop)
    + break;
    +
    if ((offset <= curr_off) && (buffer_delay(bh))) {
    to_release++;
    clear_buffer_delay(bh);
    @@ -2825,7 +2832,7 @@ static void ext4_da_invalidatepage(struct page *page, unsigned int offset,
    if (!page_has_buffers(page))
    goto out;

    - ext4_da_page_release_reservation(page, offset);
    + ext4_da_page_release_reservation(page, offset, length);

    out:
    ext4_invalidatepage(page, offset, length);
    @@ -2979,29 +2986,29 @@ ext4_readpages(struct file *file, struct address_space *mapping,
    static void ext4_invalidatepage(struct page *page, unsigned int offset,
    unsigned int length)
    {
    - trace_ext4_invalidatepage(page, offset);
    + trace_ext4_invalidatepage(page, offset, length);

    /* No journalling happens on data buffers when this function is used */
    WARN_ON(page_has_buffers(page) && buffer_jbd(page_buffers(page)));

    - block_invalidatepage(page, offset, PAGE_CACHE_SIZE - offset);
    + block_invalidatepage(page, offset, length);
    }

    static int __ext4_journalled_invalidatepage(struct page *page,
    - unsigned long offset)
    + unsigned int offset,
    + unsigned int length)
    {
    journal_t *journal = EXT4_JOURNAL(page->mapping->host);

    - trace_ext4_journalled_invalidatepage(page, offset);
    + trace_ext4_journalled_invalidatepage(page, offset, length);

    /*
    * If it's a full truncate we just forget about the pending dirtying
    */
    - if (offset == 0)
    + if (offset == 0 && length == PAGE_CACHE_SIZE)
    ClearPageChecked(page);

    - return jbd2_journal_invalidatepage(journal, page, offset,
    - PAGE_CACHE_SIZE - offset);
    + return jbd2_journal_invalidatepage(journal, page, offset, length);
    }

    /* Wrapper for aops... */
    @@ -3009,7 +3016,7 @@ static void ext4_journalled_invalidatepage(struct page *page,
    unsigned int offset,
    unsigned int length)
    {
    - WARN_ON(__ext4_journalled_invalidatepage(page, offset) < 0);
    + WARN_ON(__ext4_journalled_invalidatepage(page, offset, length) < 0);
    }

    static int ext4_releasepage(struct page *page, gfp_t wait)
    @@ -4607,7 +4614,8 @@ static void ext4_wait_for_tail_page_commit(struct inode *inode)
    inode->i_size >> PAGE_CACHE_SHIFT);
    if (!page)
    return;
    - ret = __ext4_journalled_invalidatepage(page, offset);
    + ret = __ext4_journalled_invalidatepage(page, offset,
    + PAGE_CACHE_SIZE - offset);
    unlock_page(page);
    page_cache_release(page);
    if (ret != -EBUSY)
    diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
    index 58459b7..60b329a 100644
    --- a/include/trace/events/ext4.h
    +++ b/include/trace/events/ext4.h
    @@ -444,16 +444,16 @@ DEFINE_EVENT(ext4__page_op, ext4_releasepage,
    );

    DECLARE_EVENT_CLASS(ext4_invalidatepage_op,
    - TP_PROTO(struct page *page, unsigned long offset),
    + TP_PROTO(struct page *page, unsigned int offset, unsigned int length),

    - TP_ARGS(page, offset),
    + TP_ARGS(page, offset, length),

    TP_STRUCT__entry(
    __field( dev_t, dev )
    __field( ino_t, ino )
    __field( pgoff_t, index )
    - __field( unsigned long, offset )
    -
    + __field( unsigned int, offset )
    + __field( unsigned int, length )
    ),

    TP_fast_assign(
    @@ -461,24 +461,26 @@ DECLARE_EVENT_CLASS(ext4_invalidatepage_op,
    __entry->ino = page->mapping->host->i_ino;
    __entry->index = page->index;
    __entry->offset = offset;
    + __entry->length = length;
    ),

    - TP_printk("dev %d,%d ino %lu page_index %lu offset %lu",
    + TP_printk("dev %d,%d ino %lu page_index %lu offset %u length %u",
    MAJOR(__entry->dev), MINOR(__entry->dev),
    (unsigned long) __entry->ino,
    - (unsigned long) __entry->index, __entry->offset)
    + (unsigned long) __entry->index,
    + __entry->offset, __entry->length)
    );

    DEFINE_EVENT(ext4_invalidatepage_op, ext4_invalidatepage,
    - TP_PROTO(struct page *page, unsigned long offset),
    + TP_PROTO(struct page *page, unsigned int offset, unsigned int length),

    - TP_ARGS(page, offset)
    + TP_ARGS(page, offset, length)
    );

    DEFINE_EVENT(ext4_invalidatepage_op, ext4_journalled_invalidatepage,
    - TP_PROTO(struct page *page, unsigned long offset),
    + TP_PROTO(struct page *page, unsigned int offset, unsigned int length),

    - TP_ARGS(page, offset)
    + TP_ARGS(page, offset, length)
    );

    TRACE_EVENT(ext4_discard_blocks,
    --
    1.7.7.6


    \
     
     \ /
      Last update: 2013-04-09 12:21    [W:4.071 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site