diff options
| author | Mark Brown <[email protected]> | 2015-10-12 18:09:27 +0100 | 
|---|---|---|
| committer | Mark Brown <[email protected]> | 2015-10-12 18:09:27 +0100 | 
| commit | 79828b4fa835f73cdaf4bffa48696abdcbea9d02 (patch) | |
| tree | 5e0fa7156acb75ba603022bc807df8f2fedb97a8 /fs/xfs/libxfs/xfs_attr_leaf.c | |
| parent | 721b51fcf91898299d96f4b72cb9434cda29dce6 (diff) | |
| parent | 8c1a9d6323abf0fb1e5dad96cf3f1c783505ea5a (diff) | |
Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-fix-rt5645
Diffstat (limited to 'fs/xfs/libxfs/xfs_attr_leaf.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_attr_leaf.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c index e9d401ce93bb..33df52d97ec7 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.c +++ b/fs/xfs/libxfs/xfs_attr_leaf.c @@ -262,7 +262,7 @@ xfs_attr3_leaf_verify(  		if (ichdr.magic != XFS_ATTR3_LEAF_MAGIC)  			return false; -		if (!uuid_equal(&hdr3->info.uuid, &mp->m_sb.sb_uuid)) +		if (!uuid_equal(&hdr3->info.uuid, &mp->m_sb.sb_meta_uuid))  			return false;  		if (be64_to_cpu(hdr3->info.blkno) != bp->b_bn)  			return false; @@ -1056,7 +1056,7 @@ xfs_attr3_leaf_create(  		hdr3->blkno = cpu_to_be64(bp->b_bn);  		hdr3->owner = cpu_to_be64(dp->i_ino); -		uuid_copy(&hdr3->uuid, &mp->m_sb.sb_uuid); +		uuid_copy(&hdr3->uuid, &mp->m_sb.sb_meta_uuid);  		ichdr.freemap[0].base = sizeof(struct xfs_attr3_leaf_hdr);  	} else {  |