diff --git a/[refs] b/[refs] index 8fd98b49312a..25c2e883a158 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d769b3c2ab7184ddd42056595b627cc871caa90e +refs/heads/master: 5a9a43646cf709312d71eca71cef90ad802f28f9 diff --git a/trunk/fs/open.c b/trunk/fs/open.c index b52cf013ffa1..739b751aa73e 100644 --- a/trunk/fs/open.c +++ b/trunk/fs/open.c @@ -793,7 +793,7 @@ struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry return nd->intent.open.file; out_err: release_open_intent(nd); - nd->intent.open.file = (struct file *)dentry; + nd->intent.open.file = ERR_CAST(dentry); goto out; } EXPORT_SYMBOL_GPL(lookup_instantiate_filp);