[PATCH] 2.5: further llseek cleanup (3/3)

[PATCH] 2.5: further llseek cleanup (3/3)

[Manfred Spraul]

Hi Robert,

I think the pcilynx change is wrong:

> -        if (newoffs < 0 || newoffs > PCILYNX_MAX_MEMORY + 1) return
> -EINVAL;
> +        if (newoffs < 0 || newoffs > PCILYNX_MAX_MEMORY + 1) {
> +                lock_kernel();
                  ^^^^^^ unlock_kernel()?
> +                return -EINVAL;
> +        }
>  
>          file->f_pos = newoffs;
^^^^^^^^^^^^^^^^^^^ where is the unlock here?
>          return newoffs;

--
	Manfred

[PATCH] Re: 2.5: further llseek cleanup (3/3)

[Robert Love]

On Sat, 2002-02-16 at 17:31, Manfred Spraul wrote:
> Hi Robert,
> 
> I think the pcilynx change is wrong:

Indeed.  Thank you, Manfred.

Linus, patch against 2.5.5-pre1 is attached.  Please, apply.

	Robert Love

diff -urN linux-2.5.5-pre1/drivers/ieee1394/pcilynx.c linux/drivers/ieee1394/pcilynx.c
--- linux-2.5.5-pre1/drivers/ieee1394/pcilynx.c	Wed Feb 13 18:18:46 2002
+++ linux/drivers/ieee1394/pcilynx.c	Sat Feb 16 17:58:47 2002
@@ -748,10 +748,11 @@
         }
 
         if (newoffs < 0 || newoffs > PCILYNX_MAX_MEMORY + 1) {
-                lock_kernel();
+                unlock_kernel();
                 return -EINVAL;
         }
 
+        unlock_kernel();
         file->f_pos = newoffs;
         return newoffs;
 }

Re: [PATCH] Re: 2.5: further llseek cleanup (3/3)

[Robert Love]

On Sat, 2002-02-16 at 18:00, Robert Love wrote:
> Indeed.  Thank you, Manfred.
> 
> Linus, patch against 2.5.5-pre1 is attached.  Please, apply.

Ugh, another one.  Linus, please apply.

	Robert Love

diff -urN linux-2.5.5-pre1/arch/cris/drivers/eeprom.c linux/arch/cris/drivers/eeprom.c
--- linux-2.5.5-pre1/arch/cris/drivers/eeprom.c	Wed Feb 13 18:18:43 2002
+++ linux/arch/cris/drivers/eeprom.c	Sat Feb 16 18:11:30 2002
@@ -470,17 +470,17 @@
   /* truncate position */
   if (file->f_pos < 0)
   {
-    file->f_pos = 0;    
-    unlock_kernel();
+    file->f_pos = 0;
     ret = -EOVERFLOW;
   }
-  
+
   if (file->f_pos >= eeprom.size)
   {
     file->f_pos = eeprom.size - 1;
     ret = -EOVERFLOW;
   }
 
+  unlock_kernel();
   return ( ret );
 }