[CIFS] Fix losing locks during fork()
authorPavel Shilovsky <piastryyy@gmail.com>
Wed, 21 Apr 2010 19:44:24 +0000 (19:44 +0000)
committerSteve French <sfrench@us.ibm.com>
Wed, 21 Apr 2010 19:44:24 +0000 (19:44 +0000)
When process does fork() private_data of files with lock list stays the same
for file descriptors of the parent and of the child. While finishing the child closes
files and deletes locks from the list even if unlocking fails. When the child process
finishes the parent doesn't have lock in lock list and can't unlock previously before
fork() locked region after the child process finished.

This patch provides behaviour to save locks in lock list if unlocking fails.

Signed-off-by: Pavel Shilovsky <piastryyy@gmail.com>
Reviewed-by: Jeff Layton <jlayton@samba.org>
Signed-off-by: Steve French <sfrench@us.ibm.com>
fs/cifs/file.c

index 99897e3562a7e3b8b28724abbb39fea6bbcc12b5..2ba4c41be97279e30d32234e16e1eacc467472b7 100644 (file)
@@ -922,9 +922,10 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
                                                        1, 0, li->type, false);
                                        if (stored_rc)
                                                rc = stored_rc;
-
-                                       list_del(&li->llist);
-                                       kfree(li);
+                                       else {
+                                               list_del(&li->llist);
+                                               kfree(li);
+                                       }
                                }
                        }
                        mutex_unlock(&fid->lock_mutex);