From 7ac302cfc25ca9e95689648ec13ce730d36fe167 Mon Sep 17 00:00:00 2001
From: Jack Stone <jack@hawkeye.stone.uk.eu.org>
Date: Tue, 31 Jul 2007 09:36:53 -0500
Subject: [PATCH] --- yaml --- r: 76102 b: refs/heads/master c:
 1eb3a711d6a1c8a4697a2e89d09048353b8aefd3 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/jfs/jfs_dtree.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 2726c8d3cbc9..e55dcc0fc2b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54af6233d1cb84cdfaa6ea44ea0db0bcf518baac
+refs/heads/master: 1eb3a711d6a1c8a4697a2e89d09048353b8aefd3
diff --git a/trunk/fs/jfs/jfs_dtree.c b/trunk/fs/jfs/jfs_dtree.c
index df25ecc418af..97c66f913393 100644
--- a/trunk/fs/jfs/jfs_dtree.c
+++ b/trunk/fs/jfs/jfs_dtree.c
@@ -592,9 +592,7 @@ int dtSearch(struct inode *ip, struct component_name * key, ino_t * data,
 	struct component_name ciKey;
 	struct super_block *sb = ip->i_sb;
 
-	ciKey.name =
-	    (wchar_t *) kmalloc((JFS_NAME_MAX + 1) * sizeof(wchar_t),
-				GFP_NOFS);
+	ciKey.name = kmalloc((JFS_NAME_MAX + 1) * sizeof(wchar_t), GFP_NOFS);
 	if (ciKey.name == 0) {
 		rc = -ENOMEM;
 		goto dtSearch_Exit2;
@@ -957,9 +955,7 @@ static int dtSplitUp(tid_t tid,
 	smp = split->mp;
 	sp = DT_PAGE(ip, smp);
 
-	key.name =
-	    (wchar_t *) kmalloc((JFS_NAME_MAX + 2) * sizeof(wchar_t),
-				GFP_NOFS);
+	key.name = kmalloc((JFS_NAME_MAX + 2) * sizeof(wchar_t), GFP_NOFS);
 	if (key.name == 0) {
 		DT_PUTPAGE(smp);
 		rc = -ENOMEM;