From 3d22d654ea8e7904b3535385a9374eb72e8e0beb Mon Sep 17 00:00:00 2001 From: Suresh Jayaraman Date: Mon, 10 May 2010 15:15:24 +0530 Subject: [PATCH] --- yaml --- r: 190955 b: refs/heads/master c: 51c8176472de1551a301b676e36a61884e0e8494 h: refs/heads/master i: 190953: 5b0f67323e906a32cbb647acd15bc8ea97a30129 190951: a1f491c384e454834afd9fd758bca346a873e058 v: v3 --- [refs] | 2 +- trunk/fs/cifs/file.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 366bc731c2c9..712de089d151 100644 --- 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 index d53d6308bf3a..a83541ec9713 100644 --- 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)