diff options
author | Alex Shi <alex.shi@linaro.org> | 2015-04-18 12:59:16 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2015-04-18 12:59:16 +0800 |
commit | 667ea3959654ae48ef303df13f2635fd07766cb4 (patch) | |
tree | 7f284b5ec16d010773a1101e02b0acb141ae40f4 /fs/gfs2/export.c | |
parent | 2dad587ec1dddf02a00d3b54156337a6dc79a752 (diff) | |
parent | 6fb17a412207343151aac1fde91935a542339deb (diff) |
Merge remote-tracking branch 'origin/v3.14/topic/overlayfs' into linux-linaro-lsk-v3.14
Diffstat (limited to 'fs/gfs2/export.c')
-rw-r--r-- | fs/gfs2/export.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/gfs2/export.c b/fs/gfs2/export.c index 8b9b3775e2e7..c41d255b6a7b 100644 --- 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; |