1 files changed, 19 insertions, 5 deletions

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 83e08b78dbee..c3aabb576fe5 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -6719,11 +6719,13 @@ tracing_snapshot_write(struct file *filp, const char __user *ubuf, size_t cnt,
                         break;
                 }
 #endif
-                if (!tr->allocated_snapshot) {
+                if (tr->allocated_snapshot)
+                        ret = resize_buffer_duplicate_size(&tr->max_buffer,
+                                        &tr->trace_buffer, iter->cpu_file);
+                else
                         ret = tracing_alloc_snapshot_instance(tr);
-                        if (ret < 0)
-                                break;
-                }
+                if (ret < 0)
+                        break;
                 local_irq_disable();
                 /* Now, we're going to swap */
                 if (iter->cpu_file == RING_BUFFER_ALL_CPUS)
@@ -7126,12 +7128,24 @@ static ssize_t tracing_err_log_write(struct file *file,
         return count;
 }
 
+static int tracing_err_log_release(struct inode *inode, struct file *file)
+{
+        struct trace_array *tr = inode->i_private;
+
+        trace_array_put(tr);
+
+        if (file->f_mode & FMODE_READ)
+                seq_release(inode, file);
+
+        return 0;
+}
+
 static const struct file_operations tracing_err_log_fops = {
         .open           = tracing_err_log_open,
         .write          = tracing_err_log_write,
         .read           = seq_read,
         .llseek         = seq_lseek,
-        .release        = tracing_release_generic_tr,
+        .release        = tracing_err_log_release,
 };
 
 static int tracing_buffers_open(struct inode *inode, struct file *filp)