Patchwork cifs: remove unused parameter from cifs_posix_open_inode_helper()

login
register
mail settings
Submitter Suresh Jayaraman
Date May 10, 2010, 9:45 a.m.
Message ID <1273484724-13384-1-git-send-email-sjayaraman@suse.de>
Download mbox | patch
Permalink /patch/52081/
State New
Headers show

Comments

Suresh Jayaraman - May 10, 2010, 9:45 a.m.
..a left over from the commit 3321b791b2e8897323f8c044a0c77ff25781381c.

Cc: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de>
---
 fs/cifs/file.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
Steve French - May 10, 2010, 1:52 p.m.
merged into cifs-2.6.git

On Mon, May 10, 2010 at 4:45 AM, Suresh Jayaraman <sjayaraman@suse.de> wrote:
> ..a left over from the commit 3321b791b2e8897323f8c044a0c77ff25781381c.
>
> Cc: Jeff Layton <jlayton@redhat.com>
> Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de>
> ---
>  fs/cifs/file.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/fs/cifs/file.c b/fs/cifs/file.c
> index d53d630..a83541e 100644
> --- a/fs/cifs/file.c
> +++ b/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)
>

Patch

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index d53d630..a83541e 100644
--- a/fs/cifs/file.c
+++ b/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)