diff options
| author | Ming Lei <ming.lei@canonical.com> | 2013-10-30 07:27:16 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2013-10-30 07:27:16 -0400 |
| commit | bbf023c74dcf380769aec00aedd706a266b7d9ef (patch) | |
| tree | d1c8c07bc226c0742d2cae612c65ecc7d3b1f89d | |
| parent | efbed4dc5857f845d787e406ce85097d1ccc5c4f (diff) | |
| download | blackbird-op-linux-bbf023c74dcf380769aec00aedd706a266b7d9ef.tar.gz blackbird-op-linux-bbf023c74dcf380769aec00aedd706a266b7d9ef.zip | |
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: linux-ext4@vger.kernel.org
Cc: Jan Kara <jack@suse.cz>
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
| -rw-r--r-- | fs/ext4/inode.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 94aac67b55c9..43015fa69c3a 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -2423,16 +2423,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; } /* @@ -2445,8 +2444,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)) { /* |
