diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-29 18:29:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-29 18:29:23 -0700 |
| commit | 88502b9c0a5dcc884c0dbfb6ddf964ff5da5d8d3 (patch) | |
| tree | f79f728c308100bc3e57d0d2f5d1e00d90406a0d /lib/kobject.c | |
| parent | e18945b159a1cdbc031f1d3b0b7e515a33bdcbf7 (diff) | |
| parent | 15c03dd4859ab16f9212238f29dd315654aa94f6 (diff) | |
| download | linux-88502b9c0a5dcc884c0dbfb6ddf964ff5da5d8d3.tar.gz linux-88502b9c0a5dcc884c0dbfb6ddf964ff5da5d8d3.tar.xz | |
Merge 3.12-rc3 into driver-core-next
We want the driver core and sysfs fixes in here to make merges and
development easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib/kobject.c')
| -rw-r--r-- | lib/kobject.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index a5a9b13b0648..151089788c21 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -1006,10 +1006,7 @@ const struct kobj_ns_type_operations *kobj_ns_ops(struct kobject *kobj) bool kobj_ns_current_may_mount(enum kobj_ns_type type) { - bool may_mount = false; - - if (type == KOBJ_NS_TYPE_NONE) - return true; + bool may_mount = true; spin_lock(&kobj_ns_type_lock); if ((type > KOBJ_NS_TYPE_NONE) && (type < KOBJ_NS_TYPES) && |