Commit 8fb9f73e authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

init: add an init_unlink helper 



Add a simple helper to unlink with a kernel space file name and switch
the early init code over to it.  Remove the now unused ksys_unlink.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 09267def

fs/init.c

+5 −0
Original line number Diff line number Diff line
@@ -37,3 +37,8 @@ int __init init_umount(const char *name, int flags) 
		return ret;

	return path_umount(&path, flags);

}



int __init init_unlink(const char *pathname)

{

	return do_unlinkat(AT_FDCWD, getname_kernel(pathname));

}

include/linux/init_syscalls.h

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ 
int __init init_mount(const char *dev_name, const char *dir_name,

		const char *type_page, unsigned long flags, void *data_page);

int __init init_umount(const char *name, int flags);

int __init init_unlink(const char *pathname);

include/linux/syscalls.h

+0 −7
Original line number Diff line number Diff line
@@ -1273,13 +1273,6 @@ int compat_ksys_ipc(u32 call, int first, int second, 
 * The following kernel syscall equivalents are just wrappers to fs-internal

 * functions. Therefore, provide stubs to be inlined at the callsites.

 */

extern long do_unlinkat(int dfd, struct filename *name);



static inline long ksys_unlink(const char __user *pathname)

{

	return do_unlinkat(AT_FDCWD, getname(pathname));

}



long do_rmdir(int dfd, struct filename *name);



static inline long ksys_rmdir(const char __user *pathname)

init/do_mounts.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ extern int root_mountflags; 


static inline __init int create_dev(char *name, dev_t dev)

{

	ksys_unlink(name);

	init_unlink(name);

	return ksys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));

}

init/do_mounts_initrd.c

+2 −2
Original line number Diff line number Diff line
@@ -137,11 +137,11 @@ bool __init initrd_load(void) 
		 * mounted in the normal path.

		 */

		if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {

			ksys_unlink("/initrd.image");

			init_unlink("/initrd.image");

			handle_initrd();

			return true;

		}

	}

	ksys_unlink("/initrd.image");

	init_unlink("/initrd.image");

	return false;

}