* [PATCH] ext4: pair trace_ext4_writepages & trace_ext4_writepages_result
@ 2013-10-17 12:28 Ming Lei
2013-10-17 13:31 ` Lukáš Czerner
2013-10-30 11:36 ` Theodore Ts'o
0 siblings, 2 replies; 3+ messages in thread
From: Ming Lei @ 2013-10-17 12:28 UTC (permalink / raw)
To: linux-kernel; +Cc: Jan Kara, Ming Lei, Ted Tso, linux-ext4, linux-fsdevel
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@mit.edu>
Cc: linux-ext4@vger.kernel.org
Cc: "linux-fsdevel@vger.kernel.org" <linux-fsdevel@vger.kernel.org>
Cc: Jan Kara <jack@suse.cz>
Signed-off-by: Ming Lei <ming.lei@canonical.com>
---
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)) {
/*
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ext4: pair trace_ext4_writepages & trace_ext4_writepages_result
2013-10-17 12:28 [PATCH] ext4: pair trace_ext4_writepages & trace_ext4_writepages_result Ming Lei
@ 2013-10-17 13:31 ` Lukáš Czerner
2013-10-30 11:36 ` Theodore Ts'o
1 sibling, 0 replies; 3+ messages in thread
From: Lukáš Czerner @ 2013-10-17 13:31 UTC (permalink / raw)
To: Ming Lei; +Cc: linux-kernel, Jan Kara, Ted Tso, linux-ext4, linux-fsdevel
On Thu, 17 Oct 2013, Ming Lei wrote:
> Date: Thu, 17 Oct 2013 20:28:46 +0800
> From: Ming Lei <ming.lei@canonical.com>
> To: linux-kernel@vger.kernel.org
> Cc: Jan Kara <jack@suse.cz>, Ming Lei <ming.lei@canonical.com>,
> Ted Tso <tytso@mit.edu>, linux-ext4@vger.kernel.org,
> "linux-fsdevel@vger.kernel.org" <linux-fsdevel@vger.kernel.org>
> 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@mit.edu>
> Cc: linux-ext4@vger.kernel.org
> Cc: "linux-fsdevel@vger.kernel.org" <linux-fsdevel@vger.kernel.org>
> Cc: Jan Kara <jack@suse.cz>
> Signed-off-by: Ming Lei <ming.lei@canonical.com>
It looks good.
Thanks!
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
> ---
> 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)) {
> /*
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ext4: pair trace_ext4_writepages & trace_ext4_writepages_result
2013-10-17 12:28 [PATCH] ext4: pair trace_ext4_writepages & trace_ext4_writepages_result Ming Lei
2013-10-17 13:31 ` Lukáš Czerner
@ 2013-10-30 11:36 ` Theodore Ts'o
1 sibling, 0 replies; 3+ messages in thread
From: Theodore Ts'o @ 2013-10-30 11:36 UTC (permalink / raw)
To: Ming Lei; +Cc: linux-kernel, Jan Kara, linux-ext4, linux-fsdevel
On Thu, Oct 17, 2013 at 08:28:46PM +0800, Ming Lei wrote:
> 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.
Applied, thanks!!
- Ted
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-10-30 16:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-17 12:28 [PATCH] ext4: pair trace_ext4_writepages & trace_ext4_writepages_result Ming Lei
2013-10-17 13:31 ` Lukáš Czerner
2013-10-30 11:36 ` Theodore Ts'o
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).