aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jfs/jfs_dtree.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/jfs/jfs_dtree.c')
-rw-r--r--fs/jfs/jfs_dtree.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c
index 6c3f08319846..ecb2216d881c 100644
--- a/fs/jfs/jfs_dtree.c
+++ b/fs/jfs/jfs_dtree.c
@@ -3,16 +3,16 @@
3 * 3 *
4 * This program is free software; you can redistribute it and/or modify 4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by 5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; either version 2 of the License, or 6 * the Free Software Foundation; either version 2 of the License, or
7 * (at your option) any later version. 7 * (at your option) any later version.
8 * 8 *
9 * This program is distributed in the hope that it will be useful, 9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
12 * the GNU General Public License for more details. 12 * the GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with this program; if not, write to the Free Software 15 * along with this program; if not, write to the Free Software
16 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 16 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17 */ 17 */
18 18
@@ -78,7 +78,7 @@
78 * 78 *
79 * case-insensitive search: 79 * case-insensitive search:
80 * 80 *
81 * fold search key; 81 * fold search key;
82 * 82 *
83 * case-insensitive search of B-tree: 83 * case-insensitive search of B-tree:
84 * for internal entry, router key is already folded; 84 * for internal entry, router key is already folded;
@@ -93,7 +93,7 @@
93 * else 93 * else
94 * return no match; 94 * return no match;
95 * 95 *
96 * serialization: 96 * serialization:
97 * target directory inode lock is being held on entry/exit 97 * target directory inode lock is being held on entry/exit
98 * of all main directory service routines. 98 * of all main directory service routines.
99 * 99 *
@@ -925,7 +925,7 @@ int dtInsert(tid_t tid, struct inode *ip,
925 * 925 *
926 * return: 0 - success; 926 * return: 0 - success;
927 * errno - failure; 927 * errno - failure;
928 * leaf page unpinned; 928 * leaf page unpinned;
929 */ 929 */
930static int dtSplitUp(tid_t tid, 930static int dtSplitUp(tid_t tid,
931 struct inode *ip, struct dtsplit * split, struct btstack * btstack) 931 struct inode *ip, struct dtsplit * split, struct btstack * btstack)
@@ -3767,7 +3767,7 @@ static int ciCompare(struct component_name * key, /* search key */
3767 * across page boundary 3767 * across page boundary
3768 * 3768 *
3769 * return: non-zero on error 3769 * return: non-zero on error
3770 * 3770 *
3771 */ 3771 */
3772static int ciGetLeafPrefixKey(dtpage_t * lp, int li, dtpage_t * rp, 3772static int ciGetLeafPrefixKey(dtpage_t * lp, int li, dtpage_t * rp,
3773 int ri, struct component_name * key, int flag) 3773 int ri, struct component_name * key, int flag)
@@ -3780,13 +3780,13 @@ static int ciGetLeafPrefixKey(dtpage_t * lp, int li, dtpage_t * rp,
3780 lkey.name = (wchar_t *) kmalloc((JFS_NAME_MAX + 1) * sizeof(wchar_t), 3780 lkey.name = (wchar_t *) kmalloc((JFS_NAME_MAX + 1) * sizeof(wchar_t),
3781 GFP_KERNEL); 3781 GFP_KERNEL);
3782 if (lkey.name == NULL) 3782 if (lkey.name == NULL)
3783 return -ENOSPC; 3783 return -ENOMEM;
3784 3784
3785 rkey.name = (wchar_t *) kmalloc((JFS_NAME_MAX + 1) * sizeof(wchar_t), 3785 rkey.name = (wchar_t *) kmalloc((JFS_NAME_MAX + 1) * sizeof(wchar_t),
3786 GFP_KERNEL); 3786 GFP_KERNEL);
3787 if (rkey.name == NULL) { 3787 if (rkey.name == NULL) {
3788 kfree(lkey.name); 3788 kfree(lkey.name);
3789 return -ENOSPC; 3789 return -ENOMEM;
3790 } 3790 }
3791 3791
3792 /* get left and right key */ 3792 /* get left and right key */