diff options
author | Dave Chinner <dchinner@redhat.com> | 2010-03-14 22:36:35 -0400 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2010-03-16 16:40:53 -0400 |
commit | e8c3753ce4cd6a805ebcfdb3aa6d30e6f4b8b3e0 (patch) | |
tree | cf0618d802720d77a8d1910e1085e82b1dfbb588 | |
parent | 8a262e573d30187b32b5534ec489446931239cc5 (diff) |
xfs: don't warn about page discards on shutdown
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 <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alex Elder <aelder@sgi.com>
-rw-r--r-- | fs/xfs/linux-2.6/xfs_aops.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c index 9083357f9e44..99628508cb11 100644 --- a/fs/xfs/linux-2.6/xfs_aops.c +++ b/fs/xfs/linux-2.6/xfs_aops.c | |||
@@ -932,6 +932,9 @@ xfs_aops_discard_page( | |||
932 | if (!xfs_is_delayed_page(page, IOMAP_DELAY)) | 932 | if (!xfs_is_delayed_page(page, IOMAP_DELAY)) |
933 | goto out_invalidate; | 933 | goto out_invalidate; |
934 | 934 | ||
935 | if (XFS_FORCED_SHUTDOWN(ip->i_mount)) | ||
936 | goto out_invalidate; | ||
937 | |||
935 | xfs_fs_cmn_err(CE_ALERT, ip->i_mount, | 938 | xfs_fs_cmn_err(CE_ALERT, ip->i_mount, |
936 | "page discard on page %p, inode 0x%llx, offset %llu.", | 939 | "page discard on page %p, inode 0x%llx, offset %llu.", |
937 | page, ip->i_ino, offset); | 940 | page, ip->i_ino, offset); |
@@ -964,8 +967,10 @@ xfs_aops_discard_page( | |||
964 | 967 | ||
965 | if (error) { | 968 | if (error) { |
966 | /* something screwed, just bail */ | 969 | /* something screwed, just bail */ |
967 | xfs_fs_cmn_err(CE_ALERT, ip->i_mount, | 970 | if (!XFS_FORCED_SHUTDOWN(ip->i_mount)) { |
968 | "page discard failed delalloc mapping lookup."); | 971 | xfs_fs_cmn_err(CE_ALERT, ip->i_mount, |
972 | "page discard failed delalloc mapping lookup."); | ||
973 | } | ||
969 | break; | 974 | break; |
970 | } | 975 | } |
971 | if (!nimaps) { | 976 | if (!nimaps) { |
@@ -991,8 +996,10 @@ xfs_aops_discard_page( | |||
991 | ASSERT(!flist.xbf_count && !flist.xbf_first); | 996 | ASSERT(!flist.xbf_count && !flist.xbf_first); |
992 | if (error) { | 997 | if (error) { |
993 | /* something screwed, just bail */ | 998 | /* something screwed, just bail */ |
994 | xfs_fs_cmn_err(CE_ALERT, ip->i_mount, | 999 | if (!XFS_FORCED_SHUTDOWN(ip->i_mount)) { |
1000 | xfs_fs_cmn_err(CE_ALERT, ip->i_mount, | ||
995 | "page discard unable to remove delalloc mapping."); | 1001 | "page discard unable to remove delalloc mapping."); |
1002 | } | ||
996 | break; | 1003 | break; |
997 | } | 1004 | } |
998 | next_buffer: | 1005 | next_buffer: |