summaryrefslogtreecommitdiffstats
path: root/fs/hostfs/hostfs.h
diff options
context:
space:
mode:
authorWANG Cong <wangcong@zeuux.org>2008-11-19 15:36:46 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-19 18:50:00 -0800
commitea7e743e49b94749fc739baaf160809ed279aeda (patch)
treebb6892e864240c4b91c4547deaebaa3c9a06b806 /fs/hostfs/hostfs.h
parentee11940f8e7a2f064af22d52180cb5f9643eef61 (diff)
downloadkernel-crypto-ea7e743e49b94749fc739baaf160809ed279aeda.tar.gz
kernel-crypto-ea7e743e49b94749fc739baaf160809ed279aeda.tar.xz
kernel-crypto-ea7e743e49b94749fc739baaf160809ed279aeda.zip
hostfs: fix a duplicated global function name
fs/hostfs/hostfs_user.c defines do_readlink() as non-static, and so does fs/xfs/linux-2.6/xfs_ioctl.c when CONFIG_XFS_DEBUG=y. So rename do_readlink() in hostfs to hostfs_do_readlink(). I think it's better if XFS guys will also rename their do_readlink(), it's not necessary to use such a general name. Signed-off-by: WANG Cong <wangcong@zeuux.org> Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/hostfs/hostfs.h')
-rw-r--r--fs/hostfs/hostfs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hostfs/hostfs.h b/fs/hostfs/hostfs.h
index 6ae9011b95e..2f34f8f2134 100644
--- a/fs/hostfs/hostfs.h
+++ b/fs/hostfs/hostfs.h
@@ -81,7 +81,7 @@ extern int do_rmdir(const char *file);
extern int do_mknod(const char *file, int mode, unsigned int major,
unsigned int minor);
extern int link_file(const char *from, const char *to);
-extern int do_readlink(char *file, char *buf, int size);
+extern int hostfs_do_readlink(char *file, char *buf, int size);
extern int rename_file(char *from, char *to);
extern int do_statfs(char *root, long *bsize_out, long long *blocks_out,
long long *bfree_out, long long *bavail_out,