---

yaml --- r: 190955 b: refs/heads/master c: 51c8176 h: refs/heads/master i: 190953: 5b0f673 190951: a1f491c v: v3
git-mirror · May 10, 2010 · 3d22d65 · 3d22d65
1 parent a2a3429
commit 3d22d65
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdfae149c5b7430b9a26371f14b2d385fd3a4389
+refs/heads/master: 51c8176472de1551a301b676e36a61884e0e8494
diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c
@@ -108,8 +108,7 @@ static inline int cifs_get_disposition(unsigned int flags)
 /* all arguments to this function must be checked for validity in caller */
 static inline int
 cifs_posix_open_inode_helper(struct inode *inode, struct file *file,
-			     struct cifsInodeInfo *pCifsInode,
-			     struct cifsFileInfo *pCifsFile, __u32 oplock,
+			     struct cifsInodeInfo *pCifsInode, __u32 oplock,
 			     u16 netfid)
 {
 
@@ -311,7 +310,7 @@ int cifs_open(struct inode *inode, struct file *file)
 
 			pCifsFile = cifs_fill_filedata(file);
 			cifs_posix_open_inode_helper(inode, file, pCifsInode,
-						     pCifsFile, oplock, netfid);
+						     oplock, netfid);
 			goto out;
 		} else if ((rc == -EINVAL) || (rc == -EOPNOTSUPP)) {
 			if (tcon->ses->serverNOS)