diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-07 22:24:08 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-07 22:24:08 +0300 |
| commit | 2ab704a47e0f27df758840a589aec3298dbb98dd (patch) | |
| tree | 6df76c8e361b41373aedd3350a668b8381f72368 /security/inode.c | |
| parent | ddc4e6d232d6b625a5686ec1aafe42b9e0109a4c (diff) | |
| parent | d282b9c0ac9f7fb5dff5b146e37cf820c610dacc (diff) | |
| download | linux-2ab704a47e0f27df758840a589aec3298dbb98dd.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial updates from Jiri Kosina:
"The usual rocket science from the trivial tree"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
tracing/syscalls: fix multiline in error message text
lib/Kconfig.debug: fix DEBUG_SECTION_MISMATCH description
doc: vfs: fix fadvise() sycall name
x86/entry: spell EBX register correctly in documentation
securityfs: fix securityfs_create_dir comment
irq: Fix typo in tracepoint.xml
Diffstat (limited to 'security/inode.c')
| -rw-r--r-- | security/inode.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/security/inode.c b/security/inode.c index e3df905ab5b1..acc3e9c8d5a7 100644 --- a/security/inode.c +++ b/security/inode.c @@ -156,12 +156,11 @@ EXPORT_SYMBOL_GPL(securityfs_create_file); * This function returns a pointer to a dentry if it succeeds. This * pointer must be passed to the securityfs_remove() function when the file is * to be removed (no automatic cleanup happens if your module is unloaded, - * you are responsible here). If an error occurs, %NULL will be returned. + * you are responsible here). If an error occurs, the function will return + * the error value (via ERR_PTR). * * If securityfs is not enabled in the kernel, the value %-ENODEV is - * returned. It is not wise to check for this value, but rather, check for - * %NULL or !%NULL instead as to eliminate the need for #ifdef in the calling - * code. + * returned. */ struct dentry *securityfs_create_dir(const char *name, struct dentry *parent) { |