1 files changed, 13 insertions, 1 deletions

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 4c144c1f50eb..2a6d20c0ce02 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1645,8 +1645,20 @@ cifs_setlk(struct file *file, struct file_lock *flock, __u32 type,
                 rc = server->ops->mand_unlock_range(cfile, flock, xid);
 
 out:
-        if (flock->fl_flags & FL_POSIX && !rc)
+        if (flock->fl_flags & FL_POSIX) {
+                /*
+                 * If this is a request to remove all locks because we
+                 * are closing the file, it doesn't matter if the
+                 * unlocking failed as both cifs.ko and the SMB server
+                 * remove the lock on file close
+                 */
+                if (rc) {
+                        cifs_dbg(VFS, "%s failed rc=%d\n", __func__, rc);
+                        if (!(flock->fl_flags & FL_CLOSE))
+                                return rc;
+                }
                 rc = locks_lock_file_wait(file, flock);
+        }
         return rc;
 }