fix a compile warning in InterMezzo file.c (fwd)

The patch forwarded below still applies and compiles against 2.4.25-pre8.

Please apply
Adrian

----- Forwarded message from Adrian Bunk <[email protected]> -----

Date: Fri, 5 Sep 2003 11:20:50 +0200
From: Adrian Bunk <[email protected]>
To: [email protected],
[email protected]
Cc: [email protected],
[email protected]
Subject: [2.4 patch] fix a compile warning in InterMezzo file.c

I got the following warning in 2.4.23-pre3:

<-- snip -->

...
gcc-2.95 -D__KERNEL__ -I/home/bunk/linux/kernel-2.4/linux-2.4.23-pre3-full/inclu de -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing
-fno-common -pipe -mpreferred-stack-boundary=2 -march=k6 -nostdinc -iwithprefix
include -DKBUILD_BASENAME=file -c -o file.o file.c file.c: In function `presto_open_upcall':
file.c:64: warning: `rc' might be used uninitialized in this function
...

<-- snip -->

The patch below (already included in 2.6) fixes this warning.

Please apply
Adrian

@@ -61,7 +61,7 @@
 
 static int presto_open_upcall(int minor, struct dentry *de)
 {
-        int rc;
+        int rc = 0;
         char *path, *buffer;
         struct presto_file_set *fset;
         int pathlen;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

----- End forwarded message -----

Hi,
Below patch applies to 2.4.25-pre8. Thanks.

diff -urN linux-2.4.24/fs/intermezzo.orig/dir.c linux-2.4.24/fs/intermezzo/dir.c
--- linux-2.4.24/fs/intermezzo.orig/dir.c 2002-11-29 07:53:15.000000000 +0800
+++ linux-2.4.24/fs/intermezzo/dir.c 2004-02-03 23:58:18.000000000 +0800 @@ -1378,13 +1378,9 @@

                 return rc;
         }

- case TCGETS:
- EXIT;
- return -EINVAL;
-

         default:
                 EXIT;

- return -EINVAL;
+ return -ENOTTY;

         }
         EXIT;

diff -urN linux-2.4.24/fs/intermezzo.orig/file.c linux-2.4.24/fs/intermezzo/file.c
--- linux-2.4.24/fs/intermezzo.orig/file.c 2002-11-29 07:53:15.000000000 +0800
+++ linux-2.4.24/fs/intermezzo/file.c 2004-02-04 00:12:50.000000000 +0800 @@ -61,7 +61,7 @@

static int presto_open_upcall(int minor, struct dentry *de) {
- int rc;

+        int rc=0;
         char *path, *buffer;
         struct presto_file_set *fset;
         int pathlen;

--
Yang, Chen
----- Original Message -----
From: "Adrian Bunk" <[email protected]>
To: "Marcelo Tosatti" <[email protected]>; <[email protected]>; <[email protected]>
Cc: <[email protected]>
Sent: Saturday, January 31, 2004 3:51 AM
Subject: [2.4 patch] fix a compile warning in InterMezzo file.c (fwd)

hprefix

09:42:49.000000000 +0200

11:16:37.000000000 +0200