[2.6 patch] AFS: afs_voltypes isn't always required (fwd)

[2.6 patch] AFS: afs_voltypes isn't always required (fwd)

[Adrian Bunk]

The patch forwarded below still applies and compiles against 
2.6.10-rc2-mm4.

Please apply.


----- Forwarded message from Adrian Bunk <bunk@stusta.de> -----

Date:	Sat, 30 Oct 2004 23:38:11 +0200
From: Adrian Bunk <bunk@stusta.de>
To: dhowells@redhat.com
Cc: linux-kernel@vger.kernel.org
Subject: [2.6 patch] AFS: afs_voltypes isn't always required

afs_voltypes is only used #ifdef __KDEBUG, and even then it doesn't has 
to be a global symbol.


Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.10-rc1-mm2-full/fs/afs/types.h.old	2004-10-30 20:42:02.000000000 +0200
+++ linux-2.6.10-rc1-mm2-full/fs/afs/types.h	2004-10-30 23:22:03.000000000 +0200
@@ -26,8 +26,6 @@
 	AFSVL_BACKVOL,			/* backup volume */
 } __attribute__((packed)) afs_voltype_t;
 
-extern const char *afs_voltypes[];
-
 typedef enum {
 	AFS_FTYPE_INVALID	= 0,
 	AFS_FTYPE_FILE		= 1,
--- linux-2.6.10-rc1-mm2-full/fs/afs/volume.c.old	2004-10-30 20:41:43.000000000 +0200
+++ linux-2.6.10-rc1-mm2-full/fs/afs/volume.c	2004-10-30 23:20:41.000000000 +0200
@@ -24,7 +24,9 @@
 #include "vlclient.h"
 #include "internal.h"
 
-const char *afs_voltypes[] = { "R/W", "R/O", "BAK" };
+#ifdef __KDEBUG
+static const char *afs_voltypes[] = { "R/W", "R/O", "BAK" };
+#endif
 
 #ifdef CONFIG_AFS_FSCACHE
 static fscache_match_val_t afs_volume_cache_match(void *target,
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

Re: [2.6 patch] AFS: afs_voltypes isn't always required (fwd)

[David Howells]

Adrian Bunk <bunk@stusta.de> wrote:

> afs_voltypes is only used #ifdef __KDEBUG, and even then it doesn't has 
> to be a global symbol.

I supposed I can always add this back with the next patch if I need it
then. It's currently used for a /proc file in my under-development code.

David

Re: [2.6 patch] AFS: afs_voltypes isn't always required (fwd)

[Adrian Bunk]

On Mon, Dec 13, 2004 at 02:52:10PM +0000, David Howells wrote:
> 
> Adrian Bunk <bunk@stusta.de> wrote:
> 
> > afs_voltypes is only used #ifdef __KDEBUG, and even then it doesn't has 
> > to be a global symbol.
> 
> I supposed I can always add this back with the next patch if I need it
> then. It's currently used for a /proc file in my under-development code.

Sure.

> David

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed