Merge tag 'ecryptfs-3.19-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / fs / ecryptfs / file.c

diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index 54742f9..6f4e659 100644 (file)
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -75,11 +75,11 @@ struct ecryptfs_getdents_callback {
 
 /* Inspired by generic filldir in fs/readdir.c */
 static int
-ecryptfs_filldir(void *dirent, const char *lower_name, int lower_namelen,
-                loff_t offset, u64 ino, unsigned int d_type)
+ecryptfs_filldir(struct dir_context *ctx, const char *lower_name,
+                int lower_namelen, loff_t offset, u64 ino, unsigned int d_type)
 {
        struct ecryptfs_getdents_callback *buf =
-           (struct ecryptfs_getdents_callback *)dirent;
+               container_of(ctx, struct ecryptfs_getdents_callback, ctx);
        size_t name_size;
        char *name;
        int rc;