[PA-RISC] Fix filldir warnings
filldir_t now takes a u64, not an ino_t. Signed-off-by: Matthew Wilcox <matthew@wil.cx>
This commit is contained in:
parent
17cca07237
commit
15c130c1cd
2 changed files with 5 additions and 7 deletions
|
@ -73,7 +73,7 @@ struct getdents_callback {
|
|||
#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
|
||||
|
||||
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 getdents_callback * buf = (struct getdents_callback *) __buf;
|
||||
|
|
|
@ -313,9 +313,8 @@ struct readdir32_callback {
|
|||
|
||||
#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)))
|
||||
static int
|
||||
filldir32 (void *__buf, const char *name, int namlen, loff_t offset, ino_t ino,
|
||||
unsigned int d_type)
|
||||
static int filldir32 (void *__buf, const char *name, int namlen,
|
||||
loff_t offset, u64 ino, unsigned int d_type)
|
||||
{
|
||||
struct linux32_dirent __user * dirent;
|
||||
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;
|
||||
}
|
||||
|
||||
static int
|
||||
fillonedir32 (void * __buf, const char * name, int namlen, loff_t offset, ino_t ino,
|
||||
unsigned int d_type)
|
||||
static int fillonedir32(void * __buf, const char * name, int namlen,
|
||||
loff_t offset, u64 ino, unsigned int d_type)
|
||||
{
|
||||
struct readdir32_callback * buf = (struct readdir32_callback *) __buf;
|
||||
struct old_linux32_dirent __user * dirent;
|
||||
|
|
Loading…
Reference in a new issue