Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszere...

[cascardo/linux.git] / fs / overlayfs / readdir.c

diff --git a/fs/overlayfs/readdir.c b/fs/overlayfs/readdir.c
index dcf1d41..907870e 100644 (file)
--- a/fs/overlayfs/readdir.c
+++ b/fs/overlayfs/readdir.c
@@ -205,10 +205,12 @@ static void ovl_cache_put(struct ovl_dir_file *od, struct dentry *dentry)
        }
 }
 
-static int ovl_fill_merge(void *buf, const char *name, int namelen,
-                         loff_t offset, u64 ino, unsigned int d_type)
+static int ovl_fill_merge(struct dir_context *ctx, const char *name,
+                         int namelen, loff_t offset, u64 ino,
+                         unsigned int d_type)
 {
-       struct ovl_readdir_data *rdd = buf;
+       struct ovl_readdir_data *rdd =
+               container_of(ctx, struct ovl_readdir_data, ctx);
 
        rdd->count++;
        if (!rdd->is_merge)