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

Commit 6777d773 authored by Mimi Zohar's avatar Mimi Zohar Committed by James Morris
Browse files

kernel_read: redefine offset type 



vfs_read() offset is defined as loff_t, but kernel_read()
offset is only defined as unsigned long. Redefine
kernel_read() offset as loff_t.

Cc: stable@kernel.org
Signed-off-by: default avatarMimi Zohar <zohar@us.ibm.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 3edf2fb9

fs/exec.c

+2 −2
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ exit: 
}

EXPORT_SYMBOL(open_exec);



int kernel_read(struct file *file, unsigned long offset,

int kernel_read(struct file *file, loff_t offset,

		char *addr, unsigned long count)

{

	mm_segment_t old_fs;

include/linux/fs.h

+1 −1
Original line number Diff line number Diff line
@@ -2123,7 +2123,7 @@ extern struct file *do_filp_open(int dfd, const char *pathname, 
		int open_flag, int mode, int acc_mode);

extern int may_open(struct path *, int, int);



extern int kernel_read(struct file *, unsigned long, char *, unsigned long);

extern int kernel_read(struct file *, loff_t, char *, unsigned long);

extern struct file * open_exec(const char *);

 

/* fs/dcache.c -- generic fs support functions */