Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PA-RISC] Fix filldir warnings

Browse source 
filldir_t now takes a u64, not an ino_t.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
This commit is contained in:
Matthew Wilcox 2006-10-04 13:18:25 -06:00 committed by Matthew Wilcox
parent 17cca07237
commit 15c130c1cd
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/parisc/hpux/fs.c
View file

@ -73,7 +73,7 @@ struct getdents_callback {
#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1)) #define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
static int filldir(void * __buf, const char * name, int namlen, loff_t offset, static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
ino_t ino, unsigned d_type) u64 ino, unsigned d_type)
{ {
struct hpux_dirent * dirent; struct hpux_dirent * dirent;
struct getdents_callback * buf = (struct getdents_callback *) __buf; struct getdents_callback * buf = (struct getdents_callback *) __buf;

10
arch/parisc/kernel/sys_parisc32.c
View file

@ -313,9 +313,8 @@ struct readdir32_callback {
#define ROUND_UP(x,a) ((__typeof__(x))(((unsigned long)(x) + ((a) - 1)) & ~((a) - 1))) #define ROUND_UP(x,a) ((__typeof__(x))(((unsigned long)(x) + ((a) - 1)) & ~((a) - 1)))
#define NAME_OFFSET(de) ((int) ((de)->d_name - (char __user *) (de))) #define NAME_OFFSET(de) ((int) ((de)->d_name - (char __user *) (de)))
static int static int filldir32 (void *__buf, const char *name, int namlen,
filldir32 (void *__buf, const char *name, int namlen, loff_t offset, ino_t ino, loff_t offset, u64 ino, unsigned int d_type)
unsigned int d_type)
{ {
struct linux32_dirent __user * dirent; struct linux32_dirent __user * dirent;
struct getdents32_callback * buf = (struct getdents32_callback *) __buf; struct getdents32_callback * buf = (struct getdents32_callback *) __buf;
@ -377,9 +376,8 @@ sys32_getdents (unsigned int fd, void __user * dirent, unsigned int count)
return error; return error;
} }
static int static int fillonedir32(void * __buf, const char * name, int namlen,
fillonedir32 (void * __buf, const char * name, int namlen, loff_t offset, ino_t ino, loff_t offset, u64 ino, unsigned int d_type)
unsigned int d_type)
{ {
struct readdir32_callback * buf = (struct readdir32_callback *) __buf; struct readdir32_callback * buf = (struct readdir32_callback *) __buf;
struct old_linux32_dirent __user * dirent; struct old_linux32_dirent __user * dirent;