On Thu, 17 Oct 2013, Ming Lei wrote:
> Date: Thu, 17 Oct 2013 20:28:46 +0800
> From: Ming Lei <ming.lei@xxxxxxxxxxxxx>
> To: linux-kernel@xxxxxxxxxxxxxxx
> Cc: Jan Kara <jack@xxxxxxx>, Ming Lei <ming.lei@xxxxxxxxxxxxx>,
> Ted Tso <tytso@xxxxxxx>, linux-ext4@xxxxxxxxxxxxxxx,
> "linux-fsdevel@xxxxxxxxxxxxxxx" <linux-fsdevel@xxxxxxxxxxxxxxx>
> Subject: [PATCH] ext4: pair trace_ext4_writepages &
> trace_ext4_writepages_result
>
> Pair the two trace events to make troubeshooting writepages
> easier, and it should be more convinient to write a simple script
> to parse the traces.
>
> Cc: Ted Tso <tytso@xxxxxxx>
> Cc: linux-ext4@xxxxxxxxxxxxxxx
> Cc: "linux-fsdevel@xxxxxxxxxxxxxxx" <linux-fsdevel@xxxxxxxxxxxxxxx>
> Cc: Jan Kara <jack@xxxxxxx>
> Signed-off-by: Ming Lei <ming.lei@xxxxxxxxxxxxx>
It looks good.
Thanks!
Reviewed-by: Lukas Czerner <lczerner@xxxxxxxxxx>
> ---
> fs/ext4/inode.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
> index 32beaa4..0ad73d4 100644
> --- a/fs/ext4/inode.c
> +++ b/fs/ext4/inode.c
> @@ -2420,16 +2420,15 @@ static int ext4_writepages(struct address_space *mapping,
> * because that could violate lock ordering on umount
> */
> if (!mapping->nrpages || !mapping_tagged(mapping, PAGECACHE_TAG_DIRTY))
> - return 0;
> + goto out_writepages;
>
> if (ext4_should_journal_data(inode)) {
> struct blk_plug plug;
> - int ret;
>
> blk_start_plug(&plug);
> ret = write_cache_pages(mapping, wbc, __writepage, mapping);
> blk_finish_plug(&plug);
> - return ret;
> + goto out_writepages;
> }
>
> /*
> @@ -2442,8 +2441,10 @@ static int ext4_writepages(struct address_space *mapping,
> * *never* be called, so if that ever happens, we would want
> * the stack trace.
> */
> - if (unlikely(sbi->s_mount_flags & EXT4_MF_FS_ABORTED))
> - return -EROFS;
> + if (unlikely(sbi->s_mount_flags & EXT4_MF_FS_ABORTED)) {
> + ret = -EROFS;
> + goto out_writepages;
> + }
>
> if (ext4_should_dioread_nolock(inode)) {
> /*
>
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
