diff options
| author | Jeff Layton <jlayton@redhat.com> | 2010-10-15 15:33:58 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-10-18 01:04:16 +0000 |
| commit | abfe1eedd682ea0f20e7035445982e6d371a2024 (patch) | |
| tree | 70d5fe483cae0f782b8e78ea5c08ef2dbb45c2e7 /fs/cifs/cifsproto.h | |
| parent | f6a53460e2a105904deeada737b3f878d78517b3 (diff) | |
| download | op-kernel-dev-abfe1eedd682ea0f20e7035445982e6d371a2024.zip op-kernel-dev-abfe1eedd682ea0f20e7035445982e6d371a2024.tar.gz | |
cifs: eliminate the inode argument from cifs_new_fileinfo
It already takes a file pointer. The inode associated with that had damn
well better be the same one we're passing in anyway. Thus, there's no
need for a separate argument here.
Also, get rid of the bogus check for a null pCifsInode pointer. The
CIFS_I macro uses container_of(), and that will virtually never return a
NULL pointer anyway.
Finally, move the setting of the canCache* flags outside of the lock.
Other places in the code don't hold that lock when setting it, so I
assume it's not really needed here either.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Suresh Jayaraman <sjayaraman@suse.de>
Acked-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsproto.h')
| -rw-r--r-- | fs/cifs/cifsproto.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index 781676e..ca6a0d9 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h @@ -105,8 +105,7 @@ extern u64 cifs_UnixTimeToNT(struct timespec); extern struct timespec cnvrtDosUnixTm(__le16 le_date, __le16 le_time, int offset); -extern struct cifsFileInfo *cifs_new_fileinfo(struct inode *newinode, - __u16 fileHandle, struct file *file, +extern struct cifsFileInfo *cifs_new_fileinfo(__u16 fileHandle, struct file *file, struct tcon_link *tlink, __u32 oplock); extern int cifs_posix_open(char *full_path, struct inode **pinode, struct super_block *sb, |
