xfs: don't warn about page discards on shutdown
PATCH 1/1 xfs: don't warn about page discards on shutdown
From: Dave Chinner <[email protected]>
If we are doing a forced shutdown, we can get lots of noise about delalloc pages being discarded. This is happens by design during a forced shutdown, so don't spam the logs with these messages.
Signed-off-by Dave Chinner <[email protected]>
--- fs/xfs/linux-2.6/xfs_aops.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-)
fs/xfs/linux-2.6/xfs_aops.c +10 -3
@@ -932,6 +932,9 @@ xfs_aops_discard_page(if (!xfs_is_delayed_page (page,IOMAP_DELAY )) goto out_invalidate; +if (XFS_FORCED_SHUTDOWN (ip->i_mount)) + goto out_invalidate; +xfs_fs_cmn_err (CE_ALERT , ip->i_mount,"page discard on page %p, inode 0x%llx, offset %llu." , page, ip->i_ino, offset);
@@ -964,8 +967,10 @@ xfs_aops_discard_page(if (error) {/* something screwed, just bail */ -xfs_fs_cmn_err (CE_ALERT , ip->i_mount, -"page discard failed delalloc mapping lookup." ); +if (!XFS_FORCED_SHUTDOWN (ip->i_mount)) { +xfs_fs_cmn_err (CE_ALERT , ip->i_mount, +"page discard failed delalloc mapping lookup." ); + }break ; }if (!nimaps) {
@@ -991,8 +996,10 @@ xfs_aops_discard_page(ASSERT (!flist.xbf_count && !flist.xbf_first);if (error) {/* something screwed, just bail */ -xfs_fs_cmn_err (CE_ALERT , ip->i_mount, +if (!XFS_FORCED_SHUTDOWN (ip->i_mount)) { +xfs_fs_cmn_err (CE_ALERT , ip->i_mount,"page discard unable to remove delalloc mapping." ); + }break ; } next_buffer:
Signature · 6 lines
1.6.5 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Quoted 7 lines · Dave Chinner
From: Dave Chinner <[email protected]>
If we are doing a forced shutdown, we can get lots of noise about delalloc pages being discarded. This is happens by design during a forced shutdown, so don't spam the logs with these messages.
Signed-off-by Dave Chinner <[email protected]>
Looks good, probably still a candiate for 2.6.34-rc.
Reviewed-by Christoph Hellwig <[email protected]>
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs