diff options
author | Steve French <sfrench@us.ibm.com> | 2009-05-08 03:04:30 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2009-05-08 03:04:30 +0000 |
commit | 90e4ee5d311d4e0729daa676b1d7f754265b5874 (patch) | |
tree | d1731b21e054dab9edde4f6132e8999d9f269063 /fs/cifs/dir.c | |
parent | ac68392460ffefed13020967bae04edc4d3add06 (diff) | |
download | kernel_samsung_smdk4412-90e4ee5d311d4e0729daa676b1d7f754265b5874.zip kernel_samsung_smdk4412-90e4ee5d311d4e0729daa676b1d7f754265b5874.tar.gz kernel_samsung_smdk4412-90e4ee5d311d4e0729daa676b1d7f754265b5874.tar.bz2 |
[CIFS] Fix double list addition in cifs posix open code
Remove adding open file entry twice to lists in the file
Do not fill file info twice in case of posix opens and creates
Signed-off-by: Shirish Pargaonkar <shirishp@us.ibm.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/dir.c')
-rw-r--r-- | fs/cifs/dir.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index 461750e..11431ed 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -281,6 +281,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, int create_options = CREATE_NOT_DIR; int oplock = 0; int oflags; + bool posix_create = false; /* * BB below access is probably too much for mknod to request * but we have to do query and setpathinfo so requesting @@ -328,11 +329,13 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, negotation. EREMOTE indicates DFS junction, which is not handled in posix open */ - if ((rc == 0) && (newinode == NULL)) - goto cifs_create_get_file_info; /* query inode info */ - else if (rc == 0) /* success, no need to query */ - goto cifs_create_set_dentry; - else if ((rc != -EIO) && (rc != -EREMOTE) && + if (rc == 0) { + posix_create = true; + if (newinode == NULL) /* query inode info */ + goto cifs_create_get_file_info; + else /* success, no need to query */ + goto cifs_create_set_dentry; + } else if ((rc != -EIO) && (rc != -EREMOTE) && (rc != -EOPNOTSUPP)) /* path not found or net err */ goto cifs_create_out; /* else fallthrough to retry, using older open call, this is @@ -464,7 +467,7 @@ cifs_create_set_dentry: if ((nd == NULL) || (!(nd->flags & LOOKUP_OPEN))) { /* mknod case - do not leave file open */ CIFSSMBClose(xid, tcon, fileHandle); - } else if (newinode) { + } else if (!(posix_create) && (newinode)) { cifs_fill_fileinfo(newinode, fileHandle, cifs_sb->tcon, write_only); } |