@@ -278,8 +278,7 @@ extern void cifs_add_deferred_close(struct cifsFileInfo *cfile,
extern void cifs_del_deferred_close(struct cifsFileInfo *cfile);
-extern void cifs_close_deferred_file(struct cifsInodeInfo *cifs_inode,
- bool wait_oplock_handler);
+extern void cifs_close_deferred_file(struct cifsInodeInfo *cifs_inode);
extern void cifs_close_all_deferred_files(struct cifs_tcon *cifs_tcon);
@@ -4936,7 +4936,7 @@ void cifs_oplock_break(struct work_struct *work)
cfile->deferred_close_scheduled && delayed_work_pending(&cfile->deferred)) {
if (cancel_delayed_work(&cfile->deferred)) {
_cifsFileInfo_put(cfile, false, false);
- cifs_close_deferred_file(cinode, false);
+ cifs_close_deferred_file(cinode);
goto oplock_break_done;
}
}
@@ -735,7 +735,7 @@ cifs_del_deferred_close(struct cifsFileInfo *cfile)
}
void
-cifs_close_deferred_file(struct cifsInodeInfo *cifs_inode, bool wait_oplock_handler)
+cifs_close_deferred_file(struct cifsInodeInfo *cifs_inode)
{
struct cifsFileInfo *cfile = NULL;
struct file_list *tmp_list, *tmp_next_list;
@@ -762,7 +762,7 @@ cifs_close_deferred_file(struct cifsInodeInfo *cifs_inode, bool wait_oplock_hand
spin_unlock(&cifs_inode->open_file_lock);
list_for_each_entry_safe(tmp_list, tmp_next_list, &file_head, list) {
- _cifsFileInfo_put(tmp_list->cfile, wait_oplock_handler, false);
+ _cifsFileInfo_put(tmp_list->cfile, false, false);
list_del(&tmp_list->list);
kfree(tmp_list);
}
Our only caller gave "false". Signed-off-by: Volker Lendecke <vl@samba.org> --- fs/cifs/cifsproto.h | 3 +-- fs/cifs/file.c | 2 +- fs/cifs/misc.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-)