public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* Fix up befs compile.
@ 2005-08-20 19:48 Dave Jones
  2005-08-20 19:58 ` Al Viro
  0 siblings, 1 reply; 3+ messages in thread
From: Dave Jones @ 2005-08-20 19:48 UTC (permalink / raw)
  To: Al Viro; +Cc: Linus Torvalds, Linux Kernel

fs/befs/linuxvfs.c:466: error: conflicting types for 'befs_follow_link'
fs/befs/linuxvfs.c:44: error: previous declaration of 'befs_follow_link' was here
fs/befs/linuxvfs.c: In function 'befs_follow_link':
fs/befs/linuxvfs.c:490: warning: return makes integer from pointer without a cast

Signed-off-by: Dave Jones <davej@redhat.com>


--- linux-2.6.12/fs/befs/linuxvfs.c~	2005-08-20 15:46:30.000000000 -0400
+++ linux-2.6.12/fs/befs/linuxvfs.c	2005-08-20 15:47:25.000000000 -0400
@@ -461,7 +461,7 @@ befs_destroy_inodecache(void)
  * The data stream become link name. Unless the LONG_SYMLINK
  * flag is set.
  */
-static int
+static void
 befs_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
 	befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -487,7 +487,6 @@ befs_follow_link(struct dentry *dentry, 
 	}
 
 	nd_set_link(nd, link);
-	return NULL;
 }
 
 static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Fix up befs compile.
  2005-08-20 19:48 Fix up befs compile Dave Jones
@ 2005-08-20 19:58 ` Al Viro
  2005-08-20 20:35   ` Dave Jones
  0 siblings, 1 reply; 3+ messages in thread
From: Al Viro @ 2005-08-20 19:58 UTC (permalink / raw)
  To: Dave Jones, Linus Torvalds, Linux Kernel, g

On Sat, Aug 20, 2005 at 03:48:40PM -0400, Dave Jones wrote:
> fs/befs/linuxvfs.c:466: error: conflicting types for 'befs_follow_link'
> fs/befs/linuxvfs.c:44: error: previous declaration of 'befs_follow_link' was here
> fs/befs/linuxvfs.c: In function 'befs_follow_link':
> fs/befs/linuxvfs.c:490: warning: return makes integer from pointer without a cast
> 
> Signed-off-by: Dave Jones <davej@redhat.com>
> 

It should be void *, not void.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Fix up befs compile.
  2005-08-20 19:58 ` Al Viro
@ 2005-08-20 20:35   ` Dave Jones
  0 siblings, 0 replies; 3+ messages in thread
From: Dave Jones @ 2005-08-20 20:35 UTC (permalink / raw)
  To: Al Viro; +Cc: Linus Torvalds, Linux Kernel, g

On Sat, Aug 20, 2005 at 08:58:07PM +0100, Al Viro wrote:
 > On Sat, Aug 20, 2005 at 03:48:40PM -0400, Dave Jones wrote:
 > > fs/befs/linuxvfs.c:466: error: conflicting types for 'befs_follow_link'
 > > fs/befs/linuxvfs.c:44: error: previous declaration of 'befs_follow_link' was here
 > > fs/befs/linuxvfs.c: In function 'befs_follow_link':
 > > fs/befs/linuxvfs.c:490: warning: return makes integer from pointer without a cast
 > 
 > It should be void *, not void.

Duh. Yes. of course.

Signed-off-by: Dave Jones <davej@redhat.com>

--- linux-2.6.12/fs/befs/linuxvfs.c~	2005-08-20 15:46:30.000000000 -0400
+++ linux-2.6.12/fs/befs/linuxvfs.c	2005-08-20 15:47:25.000000000 -0400
@@ -461,7 +461,7 @@ befs_destroy_inodecache(void)
  * The data stream become link name. Unless the LONG_SYMLINK
  * flag is set.
  */
-static int
+static void *
 befs_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
 	befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);

		Dave


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2005-08-20 20:36 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-08-20 19:48 Fix up befs compile Dave Jones
2005-08-20 19:58 ` Al Viro
2005-08-20 20:35   ` Dave Jones

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox