Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c41fbad0 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

fs: move kernel_read to fs/read_write.c 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent ac452aca

fs/exec.c

+0 −17
Original line number Diff line number Diff line
@@ -885,23 +885,6 @@ struct file *open_exec(const char *name) 
}

EXPORT_SYMBOL(open_exec);



int kernel_read(struct file *file, loff_t offset,

		char *addr, unsigned long count)

{

	mm_segment_t old_fs;

	loff_t pos = offset;

	int result;



	old_fs = get_fs();

	set_fs(get_ds());

	/* The cast to a user pointer is valid due to the set_fs() */

	result = vfs_read(file, (void __user *)addr, count, &pos);

	set_fs(old_fs);

	return result;

}



EXPORT_SYMBOL(kernel_read);



int kernel_read_file(struct file *file, void **buf, loff_t *size,

		     loff_t max_size, enum kernel_read_file_id id)

{

fs/read_write.c

+16 −0
Original line number Diff line number Diff line
@@ -415,6 +415,22 @@ ssize_t __vfs_read(struct file *file, char __user *buf, size_t count, 
}

EXPORT_SYMBOL(__vfs_read);



int kernel_read(struct file *file, loff_t offset, char *addr,

		unsigned long count)

{

	mm_segment_t old_fs;

	loff_t pos = offset;

	int result;



	old_fs = get_fs();

	set_fs(get_ds());

	/* The cast to a user pointer is valid due to the set_fs() */

	result = vfs_read(file, (void __user *)addr, count, &pos);

	set_fs(old_fs);

	return result;

}

EXPORT_SYMBOL(kernel_read);



ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)

{

	ssize_t ret;