From: Jan Kara <jack@suse.cz>
To: Lukas Czerner <lczerner@redhat.com>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org
Subject: Re: [PATCH v3 03/18] ext4: use ->invalidatepage() length argument
Date: Tue, 9 Apr 2013 15:24:33 +0200 [thread overview]
Message-ID: <20130409132433.GC13672@quack.suse.cz> (raw)
In-Reply-To: <1365498867-27782-4-git-send-email-lczerner@redhat.com>
On Tue 09-04-13 11:14:12, Lukas Czerner wrote:
> ->invalidatepage() aop now accepts range to invalidate so we can make
> use of it in all ext4 invalidatepage routines.
Looks good. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
>
> 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
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2013-04-09 13:24 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-09 9:14 [PATCH v3 00/18] change invalidatepage prototype to accept length Lukas Czerner
2013-04-09 9:14 ` [PATCH v3 01/18] mm: " Lukas Czerner
2013-04-09 9:14 ` [PATCH v3 02/18] jbd2: change jbd2_journal_invalidatepage " Lukas Czerner
2013-04-09 13:22 ` Jan Kara
2013-04-09 9:14 ` [PATCH v3 03/18] ext4: use ->invalidatepage() length argument Lukas Czerner
2013-04-09 13:24 ` Jan Kara [this message]
2013-04-09 9:14 ` [PATCH v3 04/18] jbd: change journal_invalidatepage() to accept length Lukas Czerner
2013-04-09 13:20 ` Jan Kara
2013-04-09 9:14 ` [PATCH v3 05/18] xfs: use ->invalidatepage() length argument Lukas Czerner
2013-04-23 14:14 ` Theodore Ts'o
2013-04-23 21:06 ` Ben Myers
2013-04-09 9:14 ` [PATCH v3 06/18] ocfs2: " Lukas Czerner
2013-04-09 13:26 ` Jan Kara
2013-04-23 14:16 ` Theodore Ts'o
2013-05-02 22:00 ` Joel Becker
2013-04-09 9:14 ` [PATCH v3 07/18] ceph: " Lukas Czerner
2013-04-23 14:14 ` Theodore Ts'o
2013-04-23 16:04 ` Sage Weil
2013-04-09 9:14 ` [PATCH v3 08/18] gfs2: " Lukas Czerner
2013-04-09 9:29 ` [Cluster-devel] " Steven Whitehouse
2013-04-09 13:09 ` Bob Peterson
2013-04-09 13:27 ` Lukáš Czerner
2013-04-23 14:16 ` Theodore Ts'o
2013-04-23 14:17 ` Theodore Ts'o
2013-04-09 9:14 ` [PATCH v3 09/18] reiserfs: " Lukas Czerner
2013-04-09 13:27 ` Jan Kara
2013-04-10 9:51 ` Lukáš Czerner
2013-04-09 9:14 ` [PATCH v3 10/18] mm: teach truncate_inode_pages_range() to handle non page aligned ranges Lukas Czerner
2013-04-11 21:18 ` Jan Kara
2013-04-11 22:40 ` Hugh Dickins
2013-04-09 9:14 ` [PATCH v3 11/18] Revert "ext4: remove no longer used functions in inode.c" Lukas Czerner
2013-04-18 22:08 ` Jan Kara
2013-04-09 9:14 ` [PATCH v3 12/18] Revert "ext4: fix fsx truncate failure" Lukas Czerner
2013-04-18 22:21 ` Jan Kara
2013-04-09 9:14 ` [PATCH v3 13/18] ext4: use ext4_zero_partial_blocks in punch_hole Lukas Czerner
2013-04-19 5:03 ` Jan Kara
2013-04-09 9:14 ` [PATCH v3 14/18] ext4: remove unused discard_partial_page_buffers Lukas Czerner
2013-04-19 5:04 ` Jan Kara
2013-04-09 9:14 ` [PATCH v3 15/18] ext4: remove unused code from ext4_remove_blocks() Lukas Czerner
2013-04-19 5:15 ` Jan Kara
2013-04-09 9:14 ` [PATCH v3 16/18] ext4: update ext4_ext_remove_space trace point Lukas Czerner
2013-04-19 5:16 ` Jan Kara
2013-04-09 9:14 ` [PATCH v3 17/18] ext4: make punch hole code path work with bigalloc Lukas Czerner
2013-04-20 13:42 ` Jan Kara
2013-04-23 9:19 ` Zheng Liu
2013-04-24 11:08 ` Lukáš Czerner
2013-04-24 11:29 ` Zheng Liu
2013-04-24 10:57 ` Lukáš Czerner
2013-04-09 9:14 ` [PATCH v3 18/18] ext4: Allow punch hole with bigalloc enabled Lukas Czerner
2013-04-20 13:43 ` Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130409132433.GC13672@quack.suse.cz \
--to=jack@suse.cz \
--cc=lczerner@redhat.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).