aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2006-10-04 15:18:25 -0400
committerMatthew Wilcox <willy@hera.kernel.org>2006-10-04 21:48:17 -0400
commit15c130c1cde38da528f82efce882e8d7632f4d91 (patch)
treefe86db3b07930ed29db8642de35a552777b32437
parent17cca07237617a2d712eb44cffd8720055e61291 (diff)
[PA-RISC] Fix filldir warnings
filldir_t now takes a u64, not an ino_t. Signed-off-by: Matthew Wilcox <matthew@wil.cx>
-rw-r--r--arch/parisc/hpux/fs.c2
-rw-r--r--arch/parisc/kernel/sys_parisc32.c10
2 files changed, 5 insertions, 7 deletions
diff --git a/arch/parisc/hpux/fs.c b/arch/parisc/hpux/fs.c
index 2d58b92b57e3..4204cd1f3cf9 100644
--- a/arch/parisc/hpux/fs.c
+++ b/arch/parisc/hpux/fs.c
@@ -73,7 +73,7 @@ struct getdents_callback {
73#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1)) 73#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
74 74
75static int filldir(void * __buf, const char * name, int namlen, loff_t offset, 75static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
76 ino_t ino, unsigned d_type) 76 u64 ino, unsigned d_type)
77{ 77{
78 struct hpux_dirent * dirent; 78 struct hpux_dirent * dirent;
79 struct getdents_callback * buf = (struct getdents_callback *) __buf; 79 struct getdents_callback * buf = (struct getdents_callback *) __buf;
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
index e0e4e0bfcc6b..29be4377aca6 100644
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
@@ -313,9 +313,8 @@ struct readdir32_callback {
313 313
314#define ROUND_UP(x,a) ((__typeof__(x))(((unsigned long)(x) + ((a) - 1)) & ~((a) - 1))) 314#define ROUND_UP(x,a) ((__typeof__(x))(((unsigned long)(x) + ((a) - 1)) & ~((a) - 1)))
315#define NAME_OFFSET(de) ((int) ((de)->d_name - (char __user *) (de))) 315#define NAME_OFFSET(de) ((int) ((de)->d_name - (char __user *) (de)))
316static int 316static int filldir32 (void *__buf, const char *name, int namlen,
317filldir32 (void *__buf, const char *name, int namlen, loff_t offset, ino_t ino, 317 loff_t offset, u64 ino, unsigned int d_type)
318 unsigned int d_type)
319{ 318{
320 struct linux32_dirent __user * dirent; 319 struct linux32_dirent __user * dirent;
321 struct getdents32_callback * buf = (struct getdents32_callback *) __buf; 320 struct getdents32_callback * buf = (struct getdents32_callback *) __buf;
@@ -377,9 +376,8 @@ out:
377 return error; 376 return error;
378} 377}
379 378
380static int 379static int fillonedir32(void * __buf, const char * name, int namlen,
381fillonedir32 (void * __buf, const char * name, int namlen, loff_t offset, ino_t ino, 380 loff_t offset, u64 ino, unsigned int d_type)
382 unsigned int d_type)
383{ 381{
384 struct readdir32_callback * buf = (struct readdir32_callback *) __buf; 382 struct readdir32_callback * buf = (struct readdir32_callback *) __buf;
385 struct old_linux32_dirent __user * dirent; 383 struct old_linux32_dirent __user * dirent;