Skip to contentSkip to conversation

Fix up befs compile.

PATCH Dave Jones 2 participants 3 messages Aug 20, 2005 Befs file system

lore
Share & tools
lore

Dave Jones

author
#0 lore raw

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

fs/befs/linuxvfs.c renamed from fs/befs/linuxvfs.c~ +1 -2
@@ -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)
#1 lore raw
Quoted 7 lines · Dave Jones

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.

author
#2 lore raw
Quoted 7 lines · Al Viro
Quoted 4 lines · Dave Jones

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.

fs/befs/linuxvfs.c renamed from fs/befs/linuxvfs.c~ +1 -1
@@ -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