diff options
| author | Dave Chinner <dchinner@redhat.com> | 2013-04-30 21:39:33 +1000 |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2013-04-30 13:07:37 -0500 |
| commit | 123887e8433e58ebbcc4c91491d8b8cde31d6d79 (patch) | |
| tree | ab9957bc6a935640054016c036ee1896cba8d27e /fs/xfs/xfs_log_recover.c | |
| parent | dccc3f447a5e065a1c4406aede72d160ae38a736 (diff) | |
| download | olio-linux-3.10-123887e8433e58ebbcc4c91491d8b8cde31d6d79.tar.xz olio-linux-3.10-123887e8433e58ebbcc4c91491d8b8cde31d6d79.zip | |
xfs: Teach dquot recovery about CONFIG_XFS_QUOTA
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>
Diffstat (limited to 'fs/xfs/xfs_log_recover.c')
| -rw-r--r-- | fs/xfs/xfs_log_recover.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 35ac5044ddf..ecaa4d4ef39 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -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: /* |