2006-11-16 02:48:40

by Chris Wright

[permalink] [raw]
Subject: [patch 30/30] CIFS: New POSIX locking code not setting rc properly to zero on successful

-stable review patch. If anyone has any objections, please let us know.
------------------

From: Steve French <[email protected]>

unlock in case where server does not support POSIX locks and nobrl is
not specified.

Signed-off-by: Steve French <[email protected]>
Signed-off-by: Chris Wright <[email protected]>
---
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);
}
}


--