diff options
| author | Pavel Shilovsky <pshilovsky@samba.org> | 2012-07-09 16:09:23 +0400 |
|---|---|---|
| committer | Pavel Shilovsky <pshilovsky@samba.org> | 2012-07-24 21:54:26 +0400 |
| commit | 4b1241006c337f57745b0fc2f17b24f8009ca82d (patch) | |
| tree | 7c79427842da24eb265e35755378c22ee38706b5 /fs/cifs/dir.c | |
| parent | 28ea5290d78a7fc87a4b4f7cedcaa662f5b8d977 (diff) | |
| download | linux-4b1241006c337f57745b0fc2f17b24f8009ca82d.tar.xz | |
CIFS: Fix a wrong pointer in atomic_open
Commit 30d904947459cca2beb69e0110716f5248b31f2a caused a regression
in cifs open codepath.
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/dir.c')
| -rw-r--r-- | fs/cifs/dir.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index d364654491e3..2caba0b54acb 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -387,7 +387,6 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry, struct cifs_tcon *tcon; __u16 fileHandle; __u32 oplock; - struct file *filp; struct cifsFileInfo *pfile_info; /* 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, inode, direntry->d_name.name, direntry); tlink = cifs_sb_tlink(CIFS_SB(inode->i_sb)); - filp = ERR_CAST(tlink); if (IS_ERR(tlink)) goto out_free_xid; @@ -436,10 +434,9 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry, goto out; } - pfile_info = cifs_new_fileinfo(fileHandle, filp, tlink, oplock); + pfile_info = cifs_new_fileinfo(fileHandle, file, tlink, oplock); if (pfile_info == NULL) { CIFSSMBClose(xid, tcon, fileHandle); - fput(filp); rc = -ENOMEM; } |