Merge remote-tracking branch 'linus/master' into testing

1 files changed, 6 insertions, 4 deletions

diff --git a/fs/gfs2/export.c b/fs/gfs2/export.c
index 9973df4ff565..8b9b3775e2e7 100644
--- a/fs/gfs2/export.c
+++ b/fs/gfs2/export.c
@@ -64,6 +64,7 @@ static int gfs2_encode_fh(struct inode *inode, __u32 *p, int *len,
 }
 
 struct get_name_filldir {
+        struct dir_context ctx;
         struct gfs2_inum_host inum;
         char *name;
 };
@@ -88,9 +89,11 @@ static int gfs2_get_name(struct dentry *parent, char *name,
         struct inode *dir = parent->d_inode;
         struct inode *inode = child->d_inode;
         struct gfs2_inode *dip, *ip;
-        struct get_name_filldir gnfd;
+        struct get_name_filldir gnfd = {
+                .ctx.actor = get_name_filldir,
+                .name = name
+        };
         struct gfs2_holder gh;
-        u64 offset = 0;
         int error;
         struct file_ra_state f_ra = { .start = 0 };
 
@@ -106,13 +109,12 @@ static int gfs2_get_name(struct dentry *parent, char *name,
         *name = 0;
         gnfd.inum.no_addr = ip->i_no_addr;
         gnfd.inum.no_formal_ino = ip->i_no_formal_ino;
-        gnfd.name = name;
 
         error = gfs2_glock_nq_init(dip->i_gl, LM_ST_SHARED, 0, &gh);
         if (error)
                 return error;
 
-        error = gfs2_dir_read(dir, &offset, &gnfd, get_name_filldir, &f_ra);
+        error = gfs2_dir_read(dir, &gnfd.ctx, &f_ra);
 
         gfs2_glock_dq_uninit(&gh);