Attachment 316612 Details for Bug 376831 – Proposed patch

Proposed patch

376831.patch (text/plain), 1.37 KB, created by IBM Bug Proxy on 2008-09-12 19:30:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: IBM Bug Proxy

Created: 2008-09-12 19:30:37 UTC

Size: 1.37 KB

patch

obsolete

>diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c
>index 2e4e040..11d5c5f 100644
>--- a/arch/powerpc/platforms/pseries/rtasd.c
>+++ b/arch/powerpc/platforms/pseries/rtasd.c
>@@ -293,21 +293,25 @@ static ssize_t rtas_log_read(struct file * file, char __user * buf,
> 	if (!access_ok(VERIFY_WRITE, buf, count))
> 		return -EFAULT;
> 
>-	tmp = kmalloc(count, GFP_KERNEL);
>-	if (!tmp)
>-		return -ENOMEM;
>-
>-
> 	spin_lock_irqsave(&rtasd_log_lock, s);
> 	/* if it's 0, then we know we got the last one (the one in NVRAM) */
>-	if (rtas_log_size == 0 && !no_logging)
>+	if (rtas_log_size == 0 && !no_logging) {
> 		nvram_clear_error_log();
>-	spin_unlock_irqrestore(&rtasd_log_lock, s);
>+		if (file->f_flags & O_NONBLOCK) {
>+			spin_unlock_irqrestore(&rtasd_log_lock, s);
>+			return -EAGAIN;
>+		}
> 
>+	}
>+	spin_unlock_irqrestore(&rtasd_log_lock, s);
> 
> 	error = wait_event_interruptible(rtas_log_wait, rtas_log_size);
> 	if (error)
>-		goto out;
>+		return error;
>+
>+	tmp = kmalloc(count, GFP_KERNEL);
>+	if (!tmp)
>+		return -ENOMEM;
> 
> 	spin_lock_irqsave(&rtasd_log_lock, s);
> 	offset = rtas_error_log_buffer_max * (rtas_log_start & LOG_NUMBER_MASK);
>@@ -318,7 +322,7 @@ static ssize_t rtas_log_read(struct file * file, char __user * buf,
> 	spin_unlock_irqrestore(&rtasd_log_lock, s);
> 
> 	error = copy_to_user(buf, tmp, count) ? -EFAULT : count;
>-out:
>+
> 	kfree(tmp);
> 	return error;
> }
>
>

Actions: View

Attachments on bug 376831: 316612