xfs: Teach dquot recovery about CONFIG_XFS_QUOTA
authorDave Chinner <dchinner@redhat.com>
Tue, 30 Apr 2013 11:39:33 +0000 (21:39 +1000)
committerBen Myers <bpm@sgi.com>
Tue, 30 Apr 2013 18:07:37 +0000 (13:07 -0500)
Fix a build error when CONFIG_XFS_QUOTA=n:

fs/built-in.o: In function `xlog_recovery_validate_buf_type':
/home/dave/src/build/x86-64/xfsdev/fs/xfs/xfs_log_recover.c:1948: undefined
reference to `xfs_dquot_buf_ops'

Reported-by: Michael L. Semon <mlsemon35@gmail.com>
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
fs/xfs/xfs_log_recover.c

index 35ac5044ddfdeeb41c7086061a3499aec8f2c3f8..ecaa4d4ef39f0c8c0cd77566c1cdc7fe9fd86f1d 100644 (file)
@@ -1940,12 +1940,18 @@ xlog_recovery_validate_buf_type(
        case XFS_BLFT_UDQUOT_BUF:
        case XFS_BLFT_PDQUOT_BUF:
        case XFS_BLFT_GDQUOT_BUF:
+#ifdef CONFIG_XFS_QUOTA
                if (magic16 != XFS_DQUOT_MAGIC) {
                        xfs_warn(mp, "Bad DQUOT block magic!");
                        ASSERT(0);
                        break;
                }
                bp->b_ops = &xfs_dquot_buf_ops;
+#else
+               xfs_alert(mp,
+       "Trying to recover dquots without QUOTA support built in!");
+               ASSERT(0);
+#endif
                break;
        case XFS_BLFT_DINO_BUF:
                /*