From 5d7dbbc5b090aabea57817ad94641675ae7e4bd6 Mon Sep 17 00:00:00 2001 From: Steve French Date: Thu, 21 Sep 2006 07:35:29 +0000 Subject: [PATCH] --- yaml --- r: 34381 b: refs/heads/master c: 6b70c9559bcf381a6521e38b0dd5d3d4d905868a h: refs/heads/master i: 34379: e0d2531d0e71f5ceea319cb6a538138bc4ce506f v: v3 --- [refs] | 2 +- trunk/fs/cifs/file.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d1e31f27406c..f8d80e413ccc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2fe87f02a04ad6e7075023a87fe38eb458a4bb9d +refs/heads/master: 6b70c9559bcf381a6521e38b0dd5d3d4d905868a diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c index e9c5ba9084fc..ddb012a68023 100644 --- a/trunk/fs/cifs/file.c +++ b/trunk/fs/cifs/file.c @@ -752,6 +752,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock) 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, struct file_lock *pfLock) kfree(li); } } - up(&fid->lock_sem); + up(&fid->lock_sem); } }