diff options
Diffstat (limited to 'fs/cifs/file.c')
-rw-r--r-- | fs/cifs/file.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index fa7beac8b80e..225d127c960e 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c | |||
@@ -123,9 +123,11 @@ static inline int cifs_get_disposition(unsigned int flags) | |||
123 | } | 123 | } |
124 | 124 | ||
125 | /* all arguments to this function must be checked for validity in caller */ | 125 | /* all arguments to this function must be checked for validity in caller */ |
126 | static inline int cifs_posix_open_inode_helper(struct inode *inode, | 126 | static inline int |
127 | struct file *file, struct cifsInodeInfo *pCifsInode, | 127 | cifs_posix_open_inode_helper(struct inode *inode, struct file *file, |
128 | struct cifsFileInfo *pCifsFile, int oplock, u16 netfid) | 128 | struct cifsInodeInfo *pCifsInode, |
129 | struct cifsFileInfo *pCifsFile, __u32 oplock, | ||
130 | u16 netfid) | ||
129 | { | 131 | { |
130 | 132 | ||
131 | write_lock(&GlobalSMBSeslock); | 133 | write_lock(&GlobalSMBSeslock); |
@@ -279,7 +281,8 @@ client_can_cache: | |||
279 | int cifs_open(struct inode *inode, struct file *file) | 281 | int cifs_open(struct inode *inode, struct file *file) |
280 | { | 282 | { |
281 | int rc = -EACCES; | 283 | int rc = -EACCES; |
282 | int xid, oplock; | 284 | int xid; |
285 | __u32 oplock; | ||
283 | struct cifs_sb_info *cifs_sb; | 286 | struct cifs_sb_info *cifs_sb; |
284 | struct cifsTconInfo *tcon; | 287 | struct cifsTconInfo *tcon; |
285 | struct cifsFileInfo *pCifsFile; | 288 | struct cifsFileInfo *pCifsFile; |
@@ -474,7 +477,8 @@ static int cifs_relock_file(struct cifsFileInfo *cifsFile) | |||
474 | static int cifs_reopen_file(struct file *file, bool can_flush) | 477 | static int cifs_reopen_file(struct file *file, bool can_flush) |
475 | { | 478 | { |
476 | int rc = -EACCES; | 479 | int rc = -EACCES; |
477 | int xid, oplock; | 480 | int xid; |
481 | __u32 oplock; | ||
478 | struct cifs_sb_info *cifs_sb; | 482 | struct cifs_sb_info *cifs_sb; |
479 | struct cifsTconInfo *tcon; | 483 | struct cifsTconInfo *tcon; |
480 | struct cifsFileInfo *pCifsFile; | 484 | struct cifsFileInfo *pCifsFile; |