Commit 2c964d1f authored Apr 21, 2010 by Pavel Shilovsky Committed by Steve French Apr 21, 2010

[CIFS] Fix losing locks during fork()

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>

parent f19159dc

fs/cifs/file.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -922,11 +922,12 @@ int cifs_lock(struct file file, int cmd, struct file_lock pfLock)
		1, 0, li->type, false);
		if (stored_rc)
		rc = stored_rc;

		else {
		list_del(&li->llist);
		kfree(li);
		}
		}
		}
		mutex_unlock(&fid->lock_mutex);
		}
		}

Admin message