| From 6b70c9559bcf381a6521e38b0dd5d3d4d905868a Mon Sep 17 00:00:00 2001 |
| From: Steve French <sfrench@us.ibm.com> |
| Date: Thu, 21 Sep 2006 07:35:29 +0000 |
| Subject: CIFS: New POSIX locking code not setting rc properly to zero on successful |
| |
| unlock in case where server does not support POSIX locks and nobrl is |
| not specified. |
| |
| Signed-off-by: Steve French <sfrench@us.ibm.com> |
| Signed-off-by: Chris Wright <chrisw@sous-sol.org> |
| --- |
| fs/cifs/file.c | 3 ++- |
| 1 files changed, 2 insertions(+), 1 deletions(-) |
| |
| diff --git a/fs/cifs/file.c b/fs/cifs/file.c |
| index e9c5ba9..ddb012a 100644 |
| --- a/fs/cifs/file.c |
| +++ b/fs/cifs/file.c |
| @@ -752,6 +752,7 @@ int cifs_lock(struct file *file, int cmd |
| int stored_rc = 0; |
| struct cifsLockInfo *li, *tmp; |
| |
| + rc = 0; |
| down(&fid->lock_sem); |
| list_for_each_entry_safe(li, tmp, &fid->llist, llist) { |
| if (pfLock->fl_start <= li->offset && |
| @@ -766,7 +767,7 @@ int cifs_lock(struct file *file, int cmd |
| kfree(li); |
| } |
| } |
| - up(&fid->lock_sem); |
| + up(&fid->lock_sem); |
| } |
| } |
| |
