tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

WANG Cong and committed by
Linus Torvalds ea7e743e ee11940f

+4 -4
+1 -1
fs/hostfs/hostfs.h
··· 81 81 extern int do_mknod(const char *file, int mode, unsigned int major, 82 82 unsigned int minor); 83 83 extern int link_file(const char *from, const char *to); 84 - extern int do_readlink(char *file, char *buf, int size); 84 + extern int hostfs_do_readlink(char *file, char *buf, int size); 85 85 extern int rename_file(char *from, char *to); 86 86 extern int do_statfs(char *root, long *bsize_out, long long *blocks_out, 87 87 long long *bfree_out, long long *bavail_out,
+2 -2
fs/hostfs/hostfs_kern.c
··· 168 168 if (name == NULL) 169 169 goto out; 170 170 171 - n = do_readlink(link, name, len); 171 + n = hostfs_do_readlink(link, name, len); 172 172 if (n < len) 173 173 break; 174 174 len *= 2; ··· 943 943 name = inode_name(page->mapping->host, 0); 944 944 if (name == NULL) 945 945 return -ENOMEM; 946 - err = do_readlink(name, buffer, PAGE_CACHE_SIZE); 946 + err = hostfs_do_readlink(name, buffer, PAGE_CACHE_SIZE); 947 947 kfree(name); 948 948 if (err == PAGE_CACHE_SIZE) 949 949 err = -E2BIG;
+1 -1
fs/hostfs/hostfs_user.c
··· 377 377 return 0; 378 378 } 379 379 380 - int do_readlink(char *file, char *buf, int size) 380 + int hostfs_do_readlink(char *file, char *buf, int size) 381 381 { 382 382 int n; 383 383