xfs: avoid null *src in memcpy call in xlog_write

[karo-tx-linux.git] / fs / xfs / xfs_log.c

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 0c8ef767c3a97dea298e69fdaef53db7d4ede871..af08326b0e4153626368d1469746a09549217de8 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -2422,11 +2422,20 @@ xlog_write(
                                                     &partial_copy_len);
                        xlog_verify_dest_ptr(log, ptr);
 
-                       /* copy region */
+                       /*
+                        * Copy region.
+                        *
+                        * Unmount records just log an opheader, so can have
+                        * empty payloads with no data region to copy. Hence we
+                        * only copy the payload if the vector says it has data
+                        * to copy.
+                        */
                        ASSERT(copy_len >= 0);
-                       memcpy(ptr, reg->i_addr + copy_off, copy_len);
-                       xlog_write_adv_cnt(&ptr, &len, &log_offset, copy_len);
-
+                       if (copy_len > 0) {
+                               memcpy(ptr, reg->i_addr + copy_off, copy_len);
+                               xlog_write_adv_cnt(&ptr, &len, &log_offset,
+                                                  copy_len);
+                       }
                        copy_len += start_rec_copy + sizeof(xlog_op_header_t);
                        record_cnt++;
                        data_cnt += contwr ? copy_len : 0;