mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
vfs: make first argument of dir_context.actor typed
Signed-off-by: Miklos Szeredi <[email protected]> Signed-off-by: Al Viro <[email protected]>
This commit is contained in:
parent
9f2f7d4c8d
commit
ac7576f4b1
19 changed files with 100 additions and 67 deletions
21
fs/compat.c
21
fs/compat.c
|
|
@ -847,10 +847,12 @@ struct compat_readdir_callback {
|
|||
int result;
|
||||
};
|
||||
|
||||
static int compat_fillonedir(void *__buf, const char *name, int namlen,
|
||||
loff_t offset, u64 ino, unsigned int d_type)
|
||||
static int compat_fillonedir(struct dir_context *ctx, const char *name,
|
||||
int namlen, loff_t offset, u64 ino,
|
||||
unsigned int d_type)
|
||||
{
|
||||
struct compat_readdir_callback *buf = __buf;
|
||||
struct compat_readdir_callback *buf =
|
||||
container_of(ctx, struct compat_readdir_callback, ctx);
|
||||
struct compat_old_linux_dirent __user *dirent;
|
||||
compat_ulong_t d_ino;
|
||||
|
||||
|
|
@ -915,11 +917,12 @@ struct compat_getdents_callback {
|
|||
int error;
|
||||
};
|
||||
|
||||
static int compat_filldir(void *__buf, const char *name, int namlen,
|
||||
static int compat_filldir(struct dir_context *ctx, const char *name, int namlen,
|
||||
loff_t offset, u64 ino, unsigned int d_type)
|
||||
{
|
||||
struct compat_linux_dirent __user * dirent;
|
||||
struct compat_getdents_callback *buf = __buf;
|
||||
struct compat_getdents_callback *buf =
|
||||
container_of(ctx, struct compat_getdents_callback, ctx);
|
||||
compat_ulong_t d_ino;
|
||||
int reclen = ALIGN(offsetof(struct compat_linux_dirent, d_name) +
|
||||
namlen + 2, sizeof(compat_long_t));
|
||||
|
|
@ -1001,11 +1004,13 @@ struct compat_getdents_callback64 {
|
|||
int error;
|
||||
};
|
||||
|
||||
static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t offset,
|
||||
u64 ino, unsigned int d_type)
|
||||
static int compat_filldir64(struct dir_context *ctx, const char *name,
|
||||
int namlen, loff_t offset, u64 ino,
|
||||
unsigned int d_type)
|
||||
{
|
||||
struct linux_dirent64 __user *dirent;
|
||||
struct compat_getdents_callback64 *buf = __buf;
|
||||
struct compat_getdents_callback64 *buf =
|
||||
container_of(ctx, struct compat_getdents_callback64, ctx);
|
||||
int reclen = ALIGN(offsetof(struct linux_dirent64, d_name) + namlen + 1,
|
||||
sizeof(u64));
|
||||
u64 off;
|
||||
|
|
|
|||
Loading…
Reference in a new issue