summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_dquot.c
diff options
context:
space:
mode:
authorDave Chinner2015-08-20 01:28:45 +0200
committerDave Chinner2015-08-20 01:28:45 +0200
commitaa493382cb8c5768ba452d87f175fc2aff63911d (patch)
tree85896c37038d3f5eda1283d090eeb95ee6ec9c82 /fs/xfs/xfs_dquot.c
parentMerge branch 'xfs-efi-rework' into for-next (diff)
parentxfs: inode lockdep annotations broke non-lockdep build (diff)
downloadkernel-qcow2-linux-aa493382cb8c5768ba452d87f175fc2aff63911d.tar.gz
kernel-qcow2-linux-aa493382cb8c5768ba452d87f175fc2aff63911d.tar.xz
kernel-qcow2-linux-aa493382cb8c5768ba452d87f175fc2aff63911d.zip
Merge branch 'xfs-misc-fixes-for-4.3-2' into for-next
Diffstat (limited to 'fs/xfs/xfs_dquot.c')
-rw-r--r--fs/xfs/xfs_dquot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index 6964d7ceba96..30cb3afb67f0 100644
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -251,7 +251,7 @@ xfs_qm_init_dquot_blk(
d->dd_diskdq.d_id = cpu_to_be32(curid);
d->dd_diskdq.d_flags = type;
if (xfs_sb_version_hascrc(&mp->m_sb)) {
- uuid_copy(&d->dd_uuid, &mp->m_sb.sb_uuid);
+ uuid_copy(&d->dd_uuid, &mp->m_sb.sb_meta_uuid);
xfs_update_cksum((char *)d, sizeof(struct xfs_dqblk),
XFS_DQUOT_CRC_OFF);
}