Merge remote-tracking branches 'asoc/topic/ab8500', 'asoc/topic/ac97' and 'asoc/topic...

[firefly-linux-kernel-4.4.55.git] / fs / xfs / xfs_log.c

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 149a4a575a09bb5b4cf164f420a03fd492849dd0..ca4fd5bd8522ced2b17363487a1d0d39d60f4a8f 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -1378,8 +1378,14 @@ xlog_alloc_log(
 
        xlog_get_iclog_buffer_size(mp, log);
 
+       /*
+        * Use a NULL block for the extra log buffer used during splits so that
+        * it will trigger errors if we ever try to do IO on it without first
+        * having set it up properly.
+        */
        error = -ENOMEM;
-       bp = xfs_buf_alloc(mp->m_logdev_targp, 0, BTOBB(log->l_iclog_size), 0);
+       bp = xfs_buf_alloc(mp->m_logdev_targp, XFS_BUF_DADDR_NULL,
+                          BTOBB(log->l_iclog_size), 0);
        if (!bp)
                goto out_free_log;