Merge branch 'xfs-misc-fixes-for-4.3-2' into for-next

diff --cc fs/xfs/libxfs/xfs_da_btree.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_dir2.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_sb.c
Simple merge

diff --cc fs/xfs/xfs_dquot.c
Simple merge

diff --cc fs/xfs/xfs_file.c
Simple merge

diff --cc fs/xfs/xfs_inode.c
Simple merge

diff --cc fs/xfs/xfs_log_recover.c
index 2e40f5e,86c3de4..512a094
--- 1/fs/xfs/xfs_log_recover.c
--- 2/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@@ -1886,17 -1886,22 +1886,27 @@@ xlog_recover_get_buf_lsn
                uuid = &((struct xfs_dir3_blk_hdr *)blk)->uuid;
                break;
        case XFS_ATTR3_RMT_MAGIC:
 -              lsn = be64_to_cpu(((struct xfs_attr3_rmt_hdr *)blk)->rm_lsn);
 -              uuid = &((struct xfs_attr3_rmt_hdr *)blk)->rm_uuid;
 -              break;
 +              /*
 +               * Remote attr blocks are written synchronously, rather than
 +               * being logged. That means they do not contain a valid LSN
 +               * (i.e. transactionally ordered) in them, and hence any time we
 +               * see a buffer to replay over the top of a remote attribute
 +               * block we should simply do so.
 +               */
 +              goto recover_immediately;
        case XFS_SB_MAGIC:
+               /*
+                * superblock uuids are magic. We may or may not have a
+                * sb_meta_uuid on disk, but it will be set in the in-core
+                * superblock. We set the uuid pointer for verification
+                * according to the superblock feature mask to ensure we check
+                * the relevant UUID in the superblock.
+                */
                lsn = be64_to_cpu(((struct xfs_dsb *)blk)->sb_lsn);
-               uuid = &((struct xfs_dsb *)blk)->sb_uuid;
+               if (xfs_sb_version_hasmetauuid(&mp->m_sb))
+                       uuid = &((struct xfs_dsb *)blk)->sb_meta_uuid;
+               else
+                       uuid = &((struct xfs_dsb *)blk)->sb_uuid;
                break;
        default:
                break;

diff --cc fs/xfs/xfs_symlink.c
Simple merge