Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9p: potential ERR_PTR() dereference

fs/9p/fid.c

@@ -242,6 +242,7 @@ struct p9_fid *v9fs_fid_lookup(struct dentry *dentry)
 	}
 	kfree(wnames);
 fid_out:
+	if (!IS_ERR(fid))
 		v9fs_fid_add(dentry, fid);
 err_out:
 	up_read(&v9ses->rename_sem);