korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 21:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

[S390] monwriter find header logic.

Browse Source 
Fix logic for finding matching buffers.

Signed-off-by: Melissa Howland <melissah@us.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Melissa Howland 2006-10-18 18:30:49 +02:00 committed by Martin Schwidefsky
parent 85a4aa64a8
commit 2c91971f84
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/s390/char/monwriter.c
View File

@ -73,12 +73,15 @@ static inline struct mon_buf *monwrite_find_hdr(struct mon_private *monpriv,
struct mon_buf *entry, *next; struct mon_buf *entry, *next;
list_for_each_entry_safe(entry, next, &monpriv->list, list) list_for_each_entry_safe(entry, next, &monpriv->list, list)
if (entry->hdr.applid == monhdr->applid && if ((entry->hdr.mon_function == monhdr->mon_function ||
monhdr->mon_function == MONWRITE_STOP_INTERVAL) &&
entry->hdr.applid == monhdr->applid &&
entry->hdr.record_num == monhdr->record_num && entry->hdr.record_num == monhdr->record_num &&
entry->hdr.version == monhdr->version && entry->hdr.version == monhdr->version &&
entry->hdr.release == monhdr->release && entry->hdr.release == monhdr->release &&
entry->hdr.mod_level == monhdr->mod_level) entry->hdr.mod_level == monhdr->mod_level)
return entry; return entry;
return NULL; return NULL;
} }
@ -92,7 +95,9 @@ static int monwrite_new_hdr(struct mon_private *monpriv)
monhdr->mon_function > MONWRITE_START_CONFIG || monhdr->mon_function > MONWRITE_START_CONFIG ||
monhdr->hdrlen != sizeof(struct monwrite_hdr)) monhdr->hdrlen != sizeof(struct monwrite_hdr))
return -EINVAL; return -EINVAL;
monbuf = monwrite_find_hdr(monpriv, monhdr); monbuf = NULL;
if (monhdr->mon_function != MONWRITE_GEN_EVENT)
monbuf = monwrite_find_hdr(monpriv, monhdr);
if (monbuf) { if (monbuf) {
if (monhdr->mon_function == MONWRITE_STOP_INTERVAL) { if (monhdr->mon_function == MONWRITE_STOP_INTERVAL) {
monhdr->datalen = monbuf->hdr.datalen; monhdr->datalen = monbuf->hdr.datalen;
@ -104,7 +109,7 @@ static int monwrite_new_hdr(struct mon_private *monpriv)
kfree(monbuf); kfree(monbuf);
monbuf = NULL; monbuf = NULL;
} }
} else { } else if (monhdr->mon_function != MONWRITE_STOP_INTERVAL) {
if (mon_buf_count >= mon_max_bufs) if (mon_buf_count >= mon_max_bufs)
return -ENOSPC; return -ENOSPC;
monbuf = kzalloc(sizeof(struct mon_buf), GFP_KERNEL); monbuf = kzalloc(sizeof(struct mon_buf), GFP_KERNEL);
@ -118,7 +123,8 @@ static int monwrite_new_hdr(struct mon_private *monpriv)
} }
monbuf->hdr = *monhdr; monbuf->hdr = *monhdr;
list_add_tail(&monbuf->list, &monpriv->list); list_add_tail(&monbuf->list, &monpriv->list);
mon_buf_count++; if (monhdr->mon_function != MONWRITE_GEN_EVENT)
mon_buf_count++;
} }
monpriv->current_buf = monbuf; monpriv->current_buf = monbuf;
return 0; return 0;