Commit 4b124100 authored by Pavel Shilovsky's avatar Pavel Shilovsky

CIFS: Fix a wrong pointer in atomic_open

Commit 30d90494 caused a regression
in cifs open codepath.
Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarPavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent 28ea5290
...@@ -387,7 +387,6 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry, ...@@ -387,7 +387,6 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
struct cifs_tcon *tcon; struct cifs_tcon *tcon;
__u16 fileHandle; __u16 fileHandle;
__u32 oplock; __u32 oplock;
struct file *filp;
struct cifsFileInfo *pfile_info; struct cifsFileInfo *pfile_info;
/* Posix open is only called (at lookup time) for file create now. For /* Posix open is only called (at lookup time) for file create now. For
...@@ -418,7 +417,6 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry, ...@@ -418,7 +417,6 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
inode, direntry->d_name.name, direntry); inode, direntry->d_name.name, direntry);
tlink = cifs_sb_tlink(CIFS_SB(inode->i_sb)); tlink = cifs_sb_tlink(CIFS_SB(inode->i_sb));
filp = ERR_CAST(tlink);
if (IS_ERR(tlink)) if (IS_ERR(tlink))
goto out_free_xid; goto out_free_xid;
...@@ -436,10 +434,9 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry, ...@@ -436,10 +434,9 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
goto out; goto out;
} }
pfile_info = cifs_new_fileinfo(fileHandle, filp, tlink, oplock); pfile_info = cifs_new_fileinfo(fileHandle, file, tlink, oplock);
if (pfile_info == NULL) { if (pfile_info == NULL) {
CIFSSMBClose(xid, tcon, fileHandle); CIFSSMBClose(xid, tcon, fileHandle);
fput(filp);
rc = -ENOMEM; rc = -ENOMEM;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment