diff options
author | Miklos Szeredi <miklos@szeredi.hu> | 2014-10-30 12:37:34 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-31 17:48:54 -0400 |
commit | ac7576f4b1da8c9c6bc1ae026c2b9e86ae617ba5 (patch) | |
tree | d1bc42645ba37d31ce4cd2208f8e4ab14d47467c /fs/overlayfs | |
parent | 9f2f7d4c8dfcf4617af5de6ea381b91deac3db48 (diff) |
vfs: make first argument of dir_context.actor typed
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/overlayfs')
-rw-r--r-- | fs/overlayfs/readdir.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/overlayfs/readdir.c b/fs/overlayfs/readdir.c index 4e9d7c1fea52..301f64aa8a45 100644 --- a/fs/overlayfs/readdir.c +++ b/fs/overlayfs/readdir.c | |||
@@ -180,10 +180,12 @@ static void ovl_cache_put(struct ovl_dir_file *od, struct dentry *dentry) | |||
180 | } | 180 | } |
181 | } | 181 | } |
182 | 182 | ||
183 | static int ovl_fill_merge(void *buf, const char *name, int namelen, | 183 | static int ovl_fill_merge(struct dir_context *ctx, const char *name, |
184 | loff_t offset, u64 ino, unsigned int d_type) | 184 | int namelen, loff_t offset, u64 ino, |
185 | unsigned int d_type) | ||
185 | { | 186 | { |
186 | struct ovl_readdir_data *rdd = buf; | 187 | struct ovl_readdir_data *rdd = |
188 | container_of(ctx, struct ovl_readdir_data, ctx); | ||
187 | 189 | ||
188 | rdd->count++; | 190 | rdd->count++; |
189 | if (!rdd->is_merge) | 191 | if (!rdd->is_merge) |