xfs: prevent needless mount warning causing test failures

Often mounting small filesystem with small logs will emit a warning
such as:

XFS (vdb): Invalid block length (0x2000) for buffer

during log recovery. This causes tests to randomly fail because this
output causes the clean filesystem checks on test completion to
think the filesystem is inconsistent.

The cause of the error is simply that log recovery is asking for a
buffer size that is larger than the log when zeroing the tail. This
is because the buffer size is rounded up, and if the right head and
tail conditions exist then the buffer size can be larger than the log.
Limit the variable size xlog_get_bp() callers to requesting buffers
smaller than the log.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>

1 files changed, 4 insertions, 0 deletions

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 396e3bfd0496..5540e79da6f5 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -440,6 +440,8 @@ xlog_find_verify_cycle(
          * a log sector, or we're out of luck.
          */
         bufblks = 1 << ffs(nbblks);
+        while (bufblks > log->l_logBBsize)
+                bufblks >>= 1;
         while (!(bp = xlog_get_bp(log, bufblks))) {
                 bufblks >>= 1;
                 if (bufblks < log->l_sectBBsize)
@@ -1225,6 +1227,8 @@ xlog_write_log_records(
          * log sector, or we're out of luck.
          */
         bufblks = 1 << ffs(blocks);
+        while (bufblks > log->l_logBBsize)
+                bufblks >>= 1;
         while (!(bp = xlog_get_bp(log, bufblks))) {
                 bufblks >>= 1;
                 if (bufblks < sectbb)