Merge tag 'media/v3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[karo-tx-linux.git] / fs / gfs2 / export.c

diff --git a/fs/gfs2/export.c b/fs/gfs2/export.c
index 8b9b3775e2e78ca24b56db57d5ec436efc5f6df3..c41d255b6a7b58808d60b205c81ce44f2b0bc75f 100644 (file)
--- a/fs/gfs2/export.c
+++ b/fs/gfs2/export.c
@@ -69,10 +69,12 @@ struct get_name_filldir {
        char *name;
 };
 
-static int get_name_filldir(void *opaque, const char *name, int length,
-                           loff_t offset, u64 inum, unsigned int type)
+static int get_name_filldir(struct dir_context *ctx, const char *name,
+                           int length, loff_t offset, u64 inum,
+                           unsigned int type)
 {
-       struct get_name_filldir *gnfd = opaque;
+       struct get_name_filldir *gnfd =
+               container_of(ctx, struct get_name_filldir, ctx);
 
        if (inum != gnfd->inum.no_addr)
                return 0;