---

yaml --- r: 162495 b: refs/heads/master c: 106a47b h: refs/heads/master i: 162493: 7992e33 162491: a078864 162487: f2ff262 162479: 026fbe0 162463: d9edfb1 162431: 235c209 v: v3
git-mirror · Sep 15, 2009 · 65efea7 · 65efea7
1 parent ce3eda0
commit 65efea7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76efa5e34ed81587e26e483a624dc7f72efb389a
+refs/heads/master: 106a47ba0a4fcdfa62e7cd708a4284c03e4db05c
diff --git a/trunk/drivers/staging/pohmelfs/config.c b/trunk/drivers/staging/pohmelfs/config.c
@@ -446,9 +446,8 @@ static int pohmelfs_cn_crypto(struct cn_msg *msg)
 	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/trunk/drivers/staging/pohmelfs/dir.c b/trunk/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);