Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[mirror_ubuntu-artful-kernel.git] / fs / orangefs / orangefs-debugfs.c

diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c
index 38887cc5577fa901acd907a0af2fb016a3441b2c..27e75cf28b3a0c386c645bf714975c4772e14866 100644 (file)
--- a/fs/orangefs/orangefs-debugfs.c
+++ b/fs/orangefs/orangefs-debugfs.c
@@ -434,6 +434,7 @@ static ssize_t orangefs_debug_write(struct file *file,
        char *debug_string;
        struct orangefs_kernel_op_s *new_op = NULL;
        struct client_debug_mask c_mask = { NULL, 0, 0 };
+       char *s;
 
        gossip_debug(GOSSIP_DEBUGFS_DEBUG,
                "orangefs_debug_write: %pD\n",
@@ -521,8 +522,9 @@ static ssize_t orangefs_debug_write(struct file *file,
        }
 
        mutex_lock(&orangefs_debug_lock);
-       memset(file->f_inode->i_private, 0, ORANGEFS_MAX_DEBUG_STRING_LEN);
-       sprintf((char *)file->f_inode->i_private, "%s\n", debug_string);
+       s = file_inode(file)->i_private;
+       memset(s, 0, ORANGEFS_MAX_DEBUG_STRING_LEN);
+       sprintf(s, "%s\n", debug_string);
        mutex_unlock(&orangefs_debug_lock);
 
        *ppos += count;
@@ -671,8 +673,10 @@ int orangefs_prepare_debugfs_help_string(int at_boot)
                 */
                cdm_element_count =
                        orangefs_prepare_cdm_array(client_debug_array_string);
-               if (cdm_element_count <= 0)
+               if (cdm_element_count <= 0) {
+                       kfree(new);
                        goto out;
+               }
 
                for (i = 0; i < cdm_element_count; i++) {
                        strlcat(new, "\t", string_size);