projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...
[deliverable/linux.git]
/
security
/
inode.c
diff --git
a/security/inode.c
b/security/inode.c
index 91503b79c5f8f8d373920da4b16854c590774799..0e37e4fba8faca36d118ab5a1dc75c139bf3ea2f 100644
(file)
--- a/
security/inode.c
+++ b/
security/inode.c
@@
-215,19
+215,17
@@
void securityfs_remove(struct dentry *dentry)
}
EXPORT_SYMBOL_GPL(securityfs_remove);
}
EXPORT_SYMBOL_GPL(securityfs_remove);
-static struct kobject *security_kobj;
-
static int __init securityfs_init(void)
{
int retval;
static int __init securityfs_init(void)
{
int retval;
-
security_kobj = kobject_create_and_add("security", kernel_kobj
);
- if (
!security_kobj
)
- return
-EINVAL
;
+
retval = sysfs_create_mount_point(kernel_kobj, "security"
);
+ if (
retval
)
+ return
retval
;
retval = register_filesystem(&fs_type);
if (retval)
retval = register_filesystem(&fs_type);
if (retval)
-
kobject_put(security_kobj
);
+
sysfs_remove_mount_point(kernel_kobj, "security"
);
return retval;
}
return retval;
}
This page took
0.025278 seconds
and
5
git commands to generate.