diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-03-27 17:02:27 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-03-27 17:02:27 +0400 |
| commit | b3fecf8cab6441527ab057c99d7e6a6d7f6713e5 (patch) | |
| tree | d327499840a25fbd1f81e49d5cb6769bdad382f5 /kernel/nsproxy.c | |
| parent | 5b62efd8250d6a751c31d1972e96bfccd19c4679 (diff) | |
| parent | 83a44ac8bf4a8e6cbbf0c00ff281a482778f708a (diff) | |
| download | linux-b3fecf8cab6441527ab057c99d7e6a6d7f6713e5.tar.xz | |
Merge branch 'for-3.10/hid-driver-transport-cleanups' into for-3.10/mt-hybrid-finger-pen
Diffstat (limited to 'kernel/nsproxy.c')
| -rw-r--r-- | kernel/nsproxy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c index b781e66a8f2c..afc0456f227a 100644 --- a/kernel/nsproxy.c +++ b/kernel/nsproxy.c @@ -250,7 +250,7 @@ SYSCALL_DEFINE2(setns, int, fd, int, nstype) return PTR_ERR(file); err = -EINVAL; - ei = PROC_I(file->f_dentry->d_inode); + ei = PROC_I(file_inode(file)); ops = ei->ns_ops; if (nstype && (ops->type != nstype)) goto out; |