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

Commit 15c130c1 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Matthew Wilcox
Browse files

[PA-RISC] Fix filldir warnings 



filldir_t now takes a u64, not an ino_t.

Signed-off-by: default avatarMatthew Wilcox <matthew@wil.cx>
parent 17cca072

arch/parisc/hpux/fs.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/parisc/kernel/sys_parisc32.c

+4 −6
Original line number Diff line number Diff line
@@ -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 @@ out: 
	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;