diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-09 17:33:58 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-09 17:33:58 (GMT) |
| commit | 6759212640fda202d0da5ce2f75dd261f1b879cc (patch) | |
| tree | 8bdb336a048bfb83b22bf87f32533483ace127fd /fs/orangefs/orangefs-debugfs.c | |
| parent | 1a59c53920eed3b2718c07286f1afe8674a7d9e6 (diff) | |
| parent | e56f49814250f4ca4b66ec7d3a71152846761d1b (diff) | |
| download | linux-6759212640fda202d0da5ce2f75dd261f1b879cc.tar.xz | |
Merge tag 'for-linus-4.6-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux
Pull orangefs fixes from Mike Marshall:
"Orangefs cleanups and a strncpy vulnerability fix.
Cleanups:
- remove an unused variable from orangefs_readdir.
- clean up printk wrapper used for ofs "gossip" debugging.
- clean up truncate ctime and mtime setting in inode.c
- remove a useless null check found by coccinelle.
- optimize some memcpy/memset boilerplate code.
- remove some useless sanity checks from xattr.c
Fix:
- fix a potential strncpy vulnerability"
* tag 'for-linus-4.6-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
orangefs: remove unused variable
orangefs: Add KERN_<LEVEL> to gossip_<level> macros
orangefs: strncpy -> strscpy
orangefs: clean up truncate ctime and mtime setting
Orangefs: fix ifnullfree.cocci warnings
Orangefs: optimize boilerplate code.
Orangefs: xattr.c cleanup
Diffstat (limited to 'fs/orangefs/orangefs-debugfs.c')
| -rw-r--r-- | fs/orangefs/orangefs-debugfs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c index 19670b8..1714a73 100644 --- a/fs/orangefs/orangefs-debugfs.c +++ b/fs/orangefs/orangefs-debugfs.c @@ -126,8 +126,7 @@ out: void orangefs_debugfs_cleanup(void) { - if (debug_dir) - debugfs_remove_recursive(debug_dir); + debugfs_remove_recursive(debug_dir); } /* open ORANGEFS_KMOD_DEBUG_HELP_FILE */ |