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

hostfs: rename do_rmdir() to hostfs_do_rmdir()

do_rmdir() is used in the VFS layer at fs/namei.c, so use a different
name in hostfs.

Cc: Jeff Dike <jdike@addtoit.com>
Cc: user-mode-linux-devel@lists.sourceforge.net
Acked-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

+3 -3
+1 -1
fs/hostfs/hostfs.h
··· 84 84 extern int make_symlink(const char *from, const char *to); 85 85 extern int unlink_file(const char *file); 86 86 extern int do_mkdir(const char *file, int mode); 87 - extern int do_rmdir(const char *file); 87 + extern int hostfs_do_rmdir(const char *file); 88 88 extern int do_mknod(const char *file, int mode, unsigned int major, 89 89 unsigned int minor); 90 90 extern int link_file(const char *from, const char *to);
+1 -1
fs/hostfs/hostfs_kern.c
··· 706 706 707 707 if ((file = dentry_name(dentry)) == NULL) 708 708 return -ENOMEM; 709 - err = do_rmdir(file); 709 + err = hostfs_do_rmdir(file); 710 710 __putname(file); 711 711 return err; 712 712 }
+1 -1
fs/hostfs/hostfs_user.c
··· 304 304 return 0; 305 305 } 306 306 307 - int do_rmdir(const char *file) 307 + int hostfs_do_rmdir(const char *file) 308 308 { 309 309 int err; 310 310