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/file.c | |
parent | ac68392460ffefed13020967bae04edc4d3add06 (diff) | |
download | op-kernel-dev-90e4ee5d311d4e0729daa676b1d7f754265b5874.zip op-kernel-dev-90e4ee5d311d4e0729daa676b1d7f754265b5874.tar.gz |
[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/file.c')
-rw-r--r-- | fs/cifs/file.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 50ca088..38c06f8 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -129,15 +129,12 @@ static inline int cifs_posix_open_inode_helper(struct inode *inode, struct file *file, struct cifsInodeInfo *pCifsInode, struct cifsFileInfo *pCifsFile, int oplock, u16 netfid) { - struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); -/* struct timespec temp; */ /* BB REMOVEME BB */ file->private_data = kmalloc(sizeof(struct cifsFileInfo), GFP_KERNEL); if (file->private_data == NULL) return -ENOMEM; pCifsFile = cifs_init_private(file->private_data, inode, file, netfid); write_lock(&GlobalSMBSeslock); - list_add(&pCifsFile->tlist, &cifs_sb->tcon->openFileList); pCifsInode = CIFS_I(file->f_path.dentry->d_inode); if (pCifsInode == NULL) { @@ -145,17 +142,6 @@ static inline int cifs_posix_open_inode_helper(struct inode *inode, return -EINVAL; } - /* want handles we can use to read with first - in the list so we do not have to walk the - list to search for one in write_begin */ - if ((file->f_flags & O_ACCMODE) == O_WRONLY) { - list_add_tail(&pCifsFile->flist, - &pCifsInode->openFileList); - } else { - list_add(&pCifsFile->flist, - &pCifsInode->openFileList); - } - if (pCifsInode->clientCanCacheRead) { /* we have the inode open somewhere else no need to discard cache data */ |