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 'acpica' into linux-next
[deliverable/linux.git]
/
fs
/
devpts
/
inode.c
diff --git
a/fs/devpts/inode.c
b/fs/devpts/inode.c
index d116453b0276634fabb32ee96df9cf96ce9cb25a..79a5941c2474622d7888c8e8c3bc925eabdb77e1 100644
(file)
--- a/
fs/devpts/inode.c
+++ b/
fs/devpts/inode.c
@@
-585,7
+585,8
@@
struct dentry *devpts_pty_new(struct pts_fs_info *fsi, int index, void *priv)
*/
void *devpts_get_priv(struct dentry *dentry)
{
*/
void *devpts_get_priv(struct dentry *dentry)
{
- WARN_ON_ONCE(dentry->d_sb->s_magic != DEVPTS_SUPER_MAGIC);
+ if (dentry->d_sb->s_magic != DEVPTS_SUPER_MAGIC)
+ return NULL;
return dentry->d_fsdata;
}
return dentry->d_fsdata;
}
This page took
0.045552 seconds
and
5
git commands to generate.