Commit 15fab3b9 authored by Brian Foster's avatar Brian Foster Committed by Darrick J. Wong

xfs: remove unnecessary shutdown check from xfs_iflush()

The shutdown check in xfs_iflush() duplicates checks down in the
buffer code. If the fs is shut down, xfs_trans_read_buf_map() always
returns an error and falls into the same error path. Remove the
unnecessary check along with the warning in xfs_imap_to_bp()
that generates excessive noise in the log if the fs is shut down.
Signed-off-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarAllison Collins <allison.henderson@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent f2019299
...@@ -172,12 +172,7 @@ xfs_imap_to_bp( ...@@ -172,12 +172,7 @@ xfs_imap_to_bp(
(int)imap->im_len, buf_flags, &bp, (int)imap->im_len, buf_flags, &bp,
&xfs_inode_buf_ops); &xfs_inode_buf_ops);
if (error) { if (error) {
if (error == -EAGAIN) { ASSERT(error != -EAGAIN || (buf_flags & XBF_TRYLOCK));
ASSERT(buf_flags & XBF_TRYLOCK);
return error;
}
xfs_warn(mp, "%s: xfs_trans_read_buf() returned error %d.",
__func__, error);
return error; return error;
} }
......
...@@ -3657,19 +3657,6 @@ xfs_iflush( ...@@ -3657,19 +3657,6 @@ xfs_iflush(
return 0; return 0;
} }
/*
* This may have been unpinned because the filesystem is shutting
* down forcibly. If that's the case we must not write this inode
* to disk, because the log record didn't make it to disk.
*
* We also have to remove the log item from the AIL in this case,
* as we wait for an empty AIL as part of the unmount process.
*/
if (XFS_FORCED_SHUTDOWN(mp)) {
error = -EIO;
goto abort;
}
/* /*
* Get the buffer containing the on-disk inode. We are doing a try-lock * Get the buffer containing the on-disk inode. We are doing a try-lock
* operation here, so we may get an EAGAIN error. In that case, return * operation here, so we may get an EAGAIN error. In that case, return
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment