[PATCH 2/2] pohmelfs: fix type errors

From: Alan Cox
Date: Wed Aug 19 2009 - 12:56:45 EST


Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
---

drivers/staging/pohmelfs/config.c | 3 +--
drivers/staging/pohmelfs/dir.c | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)


diff --git a/drivers/staging/pohmelfs/config.c b/drivers/staging/pohmelfs/config.c
index a6eaa42..99ae1d9 100644
--- a/drivers/staging/pohmelfs/config.c
+++ b/drivers/staging/pohmelfs/config.c
@@ -446,9 +446,8 @@ out_unlock:
return err;
}

-static void pohmelfs_cn_callback(void *data)
+static void pohmelfs_cn_callback(struct cn_msg *msg)
{
- struct cn_msg *msg = data;
int err;

switch (msg->flags) {
diff --git a/drivers/staging/pohmelfs/dir.c b/drivers/staging/pohmelfs/dir.c
index 4c58e22..4c63a4c 100644
--- a/drivers/staging/pohmelfs/dir.c
+++ b/drivers/staging/pohmelfs/dir.c
@@ -412,7 +412,7 @@ static int pohmelfs_readdir(struct file *file, void *dirent, filldir_t filldir)
__func__, file->f_pos, pi->ino, n->data, n->len,
n->ino, n->mode, mode, file->f_pos, n->hash);

- file->private_data = (void *)n->hash;
+ file->private_data = (void *)(unsigned long)n->hash;

len = n->len;
err = filldir(dirent, n->data, n->len, file->f_pos, n->ino, mode);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/