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

Commit ac7576f4 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Al Viro
Browse files

vfs: make first argument of dir_context.actor typed 



Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 9f2f7d4c

arch/alpha/kernel/osf_sys.c

+4 −3
Original line number Diff line number Diff line
@@ -104,11 +104,12 @@ struct osf_dirent_callback { 
};



static int

osf_filldir(void *__buf, const char *name, int namlen, loff_t offset,

	    u64 ino, unsigned int d_type)

osf_filldir(struct dir_context *ctx, const char *name, int namlen,

	    loff_t offset, u64 ino, unsigned int d_type)

{

	struct osf_dirent __user *dirent;

	struct osf_dirent_callback *buf = (struct osf_dirent_callback *) __buf;

	struct osf_dirent_callback *buf =

		container_of(ctx, struct osf_dirent_callback, ctx);

	unsigned int reclen = ALIGN(NAME_OFFSET + namlen + 1, sizeof(u32));

	unsigned int d_ino;

arch/parisc/hpux/fs.c

+4 −3
Original line number Diff line number Diff line
@@ -56,11 +56,12 @@ struct getdents_callback { 


#define NAME_OFFSET(de) ((int) ((de)->d_name - (char __user *) (de)))



static int filldir(void * __buf, const char * name, int namlen, loff_t offset,

		u64 ino, unsigned d_type)

static int filldir(struct dir_context *ctx, const char *name, int namlen,

		   loff_t offset, u64 ino, unsigned d_type)

{

	struct hpux_dirent __user * dirent;

	struct getdents_callback * buf = (struct getdents_callback *) __buf;

	struct getdents_callback *buf =

		container_of(ctx, struct getdents_callback, ctx);

	ino_t d_ino;

	int reclen = ALIGN(NAME_OFFSET(dirent) + namlen + 1, sizeof(long));

drivers/staging/lustre/lustre/llite/llite_nfs.c

+5 −3
Original line number Diff line number Diff line
@@ -207,13 +207,15 @@ static int ll_encode_fh(struct inode *inode, __u32 *fh, int *plen, 
	return LUSTRE_NFS_FID;

}



static int ll_nfs_get_name_filldir(void *cookie, const char *name, int namelen,

				   loff_t hash, u64 ino, unsigned type)

static int ll_nfs_get_name_filldir(struct dir_context *ctx, const char *name,

				   int namelen, loff_t hash, u64 ino,

				   unsigned type)

{

	/* It is hack to access lde_fid for comparison with lgd_fid.

	 * So the input 'name' must be part of the 'lu_dirent'. */

	struct lu_dirent *lde = container_of0(name, struct lu_dirent, lde_name);

	struct ll_getname_data *lgd = cookie;

	struct ll_getname_data *lgd =

		container_of(ctx, struct ll_getname_data, ctx);

	struct lu_fid fid;



	fid_le_to_cpu(&fid, &lde->lde_fid);

fs/afs/dir.c

+5 −4
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static int afs_readdir(struct file *file, struct dir_context *ctx); 
static int afs_d_revalidate(struct dentry *dentry, unsigned int flags);

static int afs_d_delete(const struct dentry *dentry);

static void afs_d_release(struct dentry *dentry);

static int afs_lookup_filldir(void *_cookie, const char *name, int nlen,

static int afs_lookup_filldir(struct dir_context *ctx, const char *name, int nlen,

				  loff_t fpos, u64 ino, unsigned dtype);

static int afs_create(struct inode *dir, struct dentry *dentry, umode_t mode,

		      bool excl);
@@ -391,10 +391,11 @@ static int afs_readdir(struct file *file, struct dir_context *ctx) 
 * - if afs_dir_iterate_block() spots this function, it'll pass the FID

 *   uniquifier through dtype

 */

static int afs_lookup_filldir(void *_cookie, const char *name, int nlen,

			      loff_t fpos, u64 ino, unsigned dtype)

static int afs_lookup_filldir(struct dir_context *ctx, const char *name,

			      int nlen, loff_t fpos, u64 ino, unsigned dtype)

{

	struct afs_lookup_cookie *cookie = _cookie;

	struct afs_lookup_cookie *cookie =

		container_of(ctx, struct afs_lookup_cookie, ctx);



	_enter("{%s,%u},%s,%u,,%llu,%u",

	       cookie->name.name, cookie->name.len, name, nlen,

fs/compat.c

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