diff options
| author | Mike Marshall <hubcap@omnibond.com> | 2017-02-25 17:12:48 +0100 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2017-02-25 17:12:48 +0100 |
| commit | e98bdb3059cbf2b1cd4261e126b08429f64466c3 (patch) | |
| tree | e378fc95b495cc6e0e558f247e99bcaa21a6d567 /fs/orangefs/orangefs-debugfs.c | |
| parent | orangefs: fix buffer size mis-match between kernel space and user space. (diff) | |
| parent | Linux 4.10 (diff) | |
| download | linux-e98bdb3059cbf2b1cd4261e126b08429f64466c3.tar.xz linux-e98bdb3059cbf2b1cd4261e126b08429f64466c3.zip | |
Merge tag 'v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into for-next
Linux 4.10
Diffstat (limited to 'fs/orangefs/orangefs-debugfs.c')
| -rw-r--r-- | fs/orangefs/orangefs-debugfs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c index 0748a26598fc..791912da97d7 100644 --- 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; |