Update to 3.3.1
svn path=/dists/trunk/linux-2.6/; revision=18908
This commit is contained in:
parent
6c28272f66
commit
855df90a5b
|
@ -1,3 +1,10 @@
|
|||
linux-2.6 (3.3.1-1~experimental.1) UNRELEASED; urgency=low
|
||||
|
||||
* New upstream stable update:
|
||||
http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.3.1
|
||||
|
||||
-- Ben Hutchings <ben@decadent.org.uk> Fri, 06 Apr 2012 20:35:03 +0100
|
||||
|
||||
linux-2.6 (3.3-1~experimental.1) experimental; urgency=low
|
||||
|
||||
* New upstream release: http://kernelnewbies.org/Linux_3.3
|
||||
|
|
|
@ -1,67 +0,0 @@
|
|||
From ce85852b90a214cf577fc1b4f49d99fd7e98784a Mon Sep 17 00:00:00 2001
|
||||
From: Pavel Shilovsky <piastry@etersoft.ru>
|
||||
Date: Sat, 17 Mar 2012 09:46:55 +0300
|
||||
Subject: [PATCH] CIFS: Fix a spurious error in cifs_push_posix_locks
|
||||
|
||||
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
|
||||
Reviewed-by: Jeff Layton <jlayton@redhat.com>
|
||||
Reported-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
Signed-off-by: Steve French <stevef@smf-gateway.(none)>
|
||||
---
|
||||
fs/cifs/file.c | 19 ++++++++++---------
|
||||
1 files changed, 10 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
|
||||
index 5e64748..8e02dbd 100644
|
||||
--- a/fs/cifs/file.c
|
||||
+++ b/fs/cifs/file.c
|
||||
@@ -960,9 +960,9 @@ cifs_push_posix_locks(struct cifsFileInfo *cfile)
|
||||
INIT_LIST_HEAD(&locks_to_send);
|
||||
|
||||
/*
|
||||
- * Allocating count locks is enough because no locks can be added to
|
||||
- * the list while we are holding cinode->lock_mutex that protects
|
||||
- * locking operations of this inode.
|
||||
+ * Allocating count locks is enough because no FL_POSIX locks can be
|
||||
+ * added to the list while we are holding cinode->lock_mutex that
|
||||
+ * protects locking operations of this inode.
|
||||
*/
|
||||
for (; i < count; i++) {
|
||||
lck = kmalloc(sizeof(struct lock_to_push), GFP_KERNEL);
|
||||
@@ -973,18 +973,20 @@ cifs_push_posix_locks(struct cifsFileInfo *cfile)
|
||||
list_add_tail(&lck->llist, &locks_to_send);
|
||||
}
|
||||
|
||||
- i = 0;
|
||||
el = locks_to_send.next;
|
||||
lock_flocks();
|
||||
cifs_for_each_lock(cfile->dentry->d_inode, before) {
|
||||
+ flock = *before;
|
||||
+ if ((flock->fl_flags & FL_POSIX) == 0)
|
||||
+ continue;
|
||||
if (el == &locks_to_send) {
|
||||
- /* something is really wrong */
|
||||
+ /*
|
||||
+ * The list ended. We don't have enough allocated
|
||||
+ * structures - something is really wrong.
|
||||
+ */
|
||||
cERROR(1, "Can't push all brlocks!");
|
||||
break;
|
||||
}
|
||||
- flock = *before;
|
||||
- if ((flock->fl_flags & FL_POSIX) == 0)
|
||||
- continue;
|
||||
length = 1 + flock->fl_end - flock->fl_start;
|
||||
if (flock->fl_type == F_RDLCK || flock->fl_type == F_SHLCK)
|
||||
type = CIFS_RDLCK;
|
||||
@@ -996,7 +998,6 @@ cifs_push_posix_locks(struct cifsFileInfo *cfile)
|
||||
lck->length = length;
|
||||
lck->type = type;
|
||||
lck->offset = flock->fl_start;
|
||||
- i++;
|
||||
el = el->next;
|
||||
}
|
||||
unlock_flocks();
|
||||
--
|
||||
1.7.0.4
|
||||
|
|
@ -52,4 +52,3 @@
|
|||
+ features/all/fs-hardlink-creation-restrictions.patch
|
||||
+ features/all/fs-hardlink-creation-restrictions-fix.patch
|
||||
+ features/all/fs-hardlink-creation-restriction-cleanup.patch
|
||||
+ bugfix/all/CIFS-Fix-a-spurious-error-in-cifs_push_posix_locks.patch
|
||||
|
|
Loading…
Reference in New Issue