Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 190957
b: refs/heads/master
c: fdb3603
h: refs/heads/master
i:
  190955: 3d22d65
v: v3
  • Loading branch information
Suresh Jayaraman authored and Steve French committed May 11, 2010
1 parent 2090b9c commit 078ba4b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fae683f764f91f31ab45512e70cc8cc81d4d157b
refs/heads/master: fdb3603800e7a65bc3cafdfd5a1797d08f09e582
17 changes: 13 additions & 4 deletions trunk/fs/cifs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,14 @@ int cifs_posix_open(char *full_path, struct inode **pinode,
* cifs_fill_filedata() takes care of setting cifsFileInfo pointer to
* file->private_data.
*/
if (mnt)
cifs_new_fileinfo(*pinode, *pnetfid, NULL, mnt, oflags);
if (mnt) {
struct cifsFileInfo *pfile_info;

pfile_info = cifs_new_fileinfo(*pinode, *pnetfid, NULL, mnt,
oflags);
if (pfile_info == NULL)
rc = -ENOMEM;
}

posix_open_ret:
kfree(presp_data);
Expand Down Expand Up @@ -476,12 +482,15 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
/* mknod case - do not leave file open */
CIFSSMBClose(xid, tcon, fileHandle);
} else if (!(posix_create) && (newinode)) {
struct cifsFileInfo *pfile_info;
/*
* cifs_fill_filedata() takes care of setting cifsFileInfo
* pointer to file->private_data.
*/
cifs_new_fileinfo(newinode, fileHandle, NULL, nd->path.mnt,
oflags);
pfile_info = cifs_new_fileinfo(newinode, fileHandle, NULL,
nd->path.mnt, oflags);
if (pfile_info == NULL)
rc = -ENOMEM;
}
cifs_create_out:
kfree(buf);
Expand Down

0 comments on commit 078ba4b

Please sign in to comment.