diff options
Diffstat (limited to 'fs/overlayfs/readdir.c')
-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) |