iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CIFS: Fix a spurious error in cifs_push_posix_locks

Browse Source 
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)>
This commit is contained in:
Pavel Shilovsky
2012-03-17 09:46:55 +03:00
committed by Steve French
parent c16fa4f2ad
commit ce85852b90
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
fs/cifs/file.c
View File

@ -960,9 +960,9 @@ cifs_push_posix_locks(struct cifsFileInfo *cfile)
INIT_LIST_HEAD(&locks_to_send); INIT_LIST_HEAD(&locks_to_send);
/* /*
* Allocating count locks is enough because no locks can be added to * Allocating count locks is enough because no FL_POSIX locks can be
* the list while we are holding cinode->lock_mutex that protects * added to the list while we are holding cinode->lock_mutex that
* locking operations of this inode. * protects locking operations of this inode.
*/ */
for (; i < count; i++) { for (; i < count; i++) {
lck = kmalloc(sizeof(struct lock_to_push), GFP_KERNEL); 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); list_add_tail(&lck->llist, &locks_to_send);
} }
i = 0;
el = locks_to_send.next; el = locks_to_send.next;
lock_flocks(); lock_flocks();
cifs_for_each_lock(cfile->dentry->d_inode, before) { cifs_for_each_lock(cfile->dentry->d_inode, before) {
if (el == &locks_to_send) {
/* something is really wrong */
cERROR(1, "Can't push all brlocks!");
break;
}
flock = *before; flock = *before;
if ((flock->fl_flags & FL_POSIX) == 0) if ((flock->fl_flags & FL_POSIX) == 0)
continue; continue;
if (el == &locks_to_send) {
/*
* The list ended. We don't have enough allocated
* structures - something is really wrong.
*/
cERROR(1, "Can't push all brlocks!");
break;
}
length = 1 + flock->fl_end - flock->fl_start; length = 1 + flock->fl_end - flock->fl_start;
if (flock->fl_type == F_RDLCK || flock->fl_type == F_SHLCK) if (flock->fl_type == F_RDLCK || flock->fl_type == F_SHLCK)
type = CIFS_RDLCK; type = CIFS_RDLCK;
@ -996,7 +998,6 @@ cifs_push_posix_locks(struct cifsFileInfo *cfile)
lck->length = length; lck->length = length;
lck->type = type; lck->type = type;
lck->offset = flock->fl_start; lck->offset = flock->fl_start;
i++;
el = el->next; el = el->next;
} }
unlock_flocks(); unlock_flocks();