patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / fs / jfs / jfs_dtree.c

diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c
index c749681..3c3140d 100644 (file)
--- a/fs/jfs/jfs_dtree.c
+++ b/fs/jfs/jfs_dtree.c
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) International Business Machines Corp., 2000-2003
+ *   Copyright (C) International Business Machines Corp., 2000-2004
  *
  *   This program is free software;  you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -177,8 +177,8 @@ static int ciCompare(struct component_name * key, dtpage_t * p, int si,
 static void dtGetKey(dtpage_t * p, int i, struct component_name * key,
                     int flag);
 
-static void ciGetLeafPrefixKey(dtpage_t * lp, int li, dtpage_t * rp,
-                              int ri, struct component_name * key, int flag);
+static int ciGetLeafPrefixKey(dtpage_t * lp, int li, dtpage_t * rp,
+                             int ri, struct component_name * key, int flag);
 
 static void dtInsertEntry(dtpage_t * p, int index, struct component_name * key,
                          ddata_t * data, struct dt_lock **);
@@ -342,7 +342,6 @@ static u32 add_index(tid_t tid, struct inode *ip, s64 bn, int slot)
        struct metapage *mp;
        s64 offset;
        uint page_offset;
-       int rc;
        struct tlock *tlck;
        s64 xaddr;
 
@@ -379,6 +378,8 @@ static u32 add_index(tid_t tid, struct inode *ip, s64 bn, int slot)
                 * It's time to move the inline table to an external
                 * page and begin to build the xtree
                 */
+               if (dbAlloc(ip, 0, sbi->nbperpage, &xaddr))
+                       goto clean_up;  /* No space */
 
                /*
                 * Save the table, we're going to overwrite it with the
@@ -395,12 +396,12 @@ static u32 add_index(tid_t tid, struct inode *ip, s64 bn, int slot)
                /*
                 * Allocate the first block & add it to the xtree
                 */
-               xaddr = 0;
-               if ((rc =
-                    xtInsert(tid, ip, 0, 0, sbi->nbperpage,
-                             &xaddr, 0))) {
+               if (xtInsert(tid, ip, 0, 0, sbi->nbperpage, &xaddr, 0)) {
+                       /* This really shouldn't fail */
                        jfs_warn("add_index: xtInsert failed!");
-                       return -EPERM;
+                       memcpy(&jfs_ip->i_dirtable, temp_table,
+                              sizeof (temp_table));
+                       goto clean_up;
                }
                ip->i_size = PSIZE;
                ip->i_blocks += LBLK2PBLK(sb, sbi->nbperpage);
@@ -408,7 +409,9 @@ static u32 add_index(tid_t tid, struct inode *ip, s64 bn, int slot)
                if ((mp = get_index_page(ip, 0)) == 0) {
                        jfs_err("add_index: get_metapage failed!");
                        xtTruncate(tid, ip, 0, COMMIT_PWMAP);
-                       return -EPERM;
+                       memcpy(&jfs_ip->i_dirtable, temp_table,
+                              sizeof (temp_table));
+                       goto clean_up;
                }
                tlck = txLock(tid, ip, mp, tlckDATA);
                llck = (struct linelock *) & tlck->lock;
@@ -438,12 +441,9 @@ static u32 add_index(tid_t tid, struct inode *ip, s64 bn, int slot)
                 * This will be the beginning of a new page
                 */
                xaddr = 0;
-               if ((rc =
-                    xtInsert(tid, ip, 0, blkno, sbi->nbperpage,
-                             &xaddr, 0))) {
+               if (xtInsert(tid, ip, 0, blkno, sbi->nbperpage, &xaddr, 0)) {
                        jfs_warn("add_index: xtInsert failed!");
-                       jfs_ip->next_index--;
-                       return -EPERM;
+                       goto clean_up;
                }
                ip->i_size += PSIZE;
                ip->i_blocks += LBLK2PBLK(sb, sbi->nbperpage);
@@ -457,7 +457,7 @@ static u32 add_index(tid_t tid, struct inode *ip, s64 bn, int slot)
 
        if (mp == 0) {
                jfs_err("add_index: get/read_metapage failed!");
-               return -EPERM;
+               goto clean_up;
        }
 
        lock_index(tid, ip, mp, index);
@@ -472,6 +472,12 @@ static u32 add_index(tid_t tid, struct inode *ip, s64 bn, int slot)
        release_metapage(mp);
 
        return index;
+
+      clean_up:
+
+       jfs_ip->next_index--;
+
+       return 0;
 }
 
 /*
@@ -760,11 +766,12 @@ int dtSearch(struct inode *ip, struct component_name * key, ino_t * data,
                 */
              getChild:
                /* update max. number of pages to split */
-               if (btstack->nsplit >= 8) {
+               if (BT_STACK_FULL(btstack)) {
                        /* Something's corrupted, mark filesytem dirty so
                         * chkdsk will fix it.
                         */
                        jfs_error(sb, "stack overrun in dtSearch!");
+                       BT_STACK_DUMP(btstack);
                        rc = -EIO;
                        goto out;
                }
@@ -971,8 +978,10 @@ static int dtSplitUp(tid_t tid,
                n -= DTROOTMAXSLOT - sp->header.freecnt; /* header + entries */
                if (n <= split->nslot)
                        xlen++;
-               if ((rc = dbAlloc(ip, 0, (s64) xlen, &xaddr)))
+               if ((rc = dbAlloc(ip, 0, (s64) xlen, &xaddr))) {
+                       DT_PUTPAGE(smp);
                        goto freeKeyName;
+               }
 
                pxdlist.maxnpxd = 1;
                pxdlist.npxd = 0;
@@ -1152,9 +1161,16 @@ static int dtSplitUp(tid_t tid,
                        if ((sp->header.flag & BT_ROOT && skip > 1) ||
                            sp->header.prev != 0 || skip > 1) {
                                /* compute uppercase router prefix key */
-                               ciGetLeafPrefixKey(lp,
-                                                  lp->header.nextindex - 1,
-                                                  rp, 0, &key, sbi->mntflag);
+                               rc = ciGetLeafPrefixKey(lp,
+                                                       lp->header.nextindex-1,
+                                                       rp, 0, &key,
+                                                       sbi->mntflag);
+                               if (rc) {
+                                       DT_PUTPAGE(lmp);
+                                       DT_PUTPAGE(rmp);
+                                       DT_PUTPAGE(smp);
+                                       goto splitOut;
+                               }
                        } else {
                                /* next to leftmost entry of
                                   lowest internal level */
@@ -3331,6 +3347,12 @@ static int dtReadFirst(struct inode *ip, struct btstack * btstack)
                /*
                 * descend down to leftmost child page
                 */
+               if (BT_STACK_FULL(btstack)) {
+                       DT_PUTPAGE(mp);
+                       jfs_error(ip->i_sb, "dtReadFirst: btstack overrun");
+                       BT_STACK_DUMP(btstack);
+                       return -EIO;
+               }
                /* push (bn, index) of the parent page/entry */
                BT_PUSH(btstack, bn, 0);
 
@@ -3713,18 +3735,28 @@ static int ciCompare(struct component_name * key,       /* search key */
  *          from two adjacent leaf entries
  *          across page boundary
  *
- * return:
- *     Number of prefix bytes needed to distinguish b from a.
+ * return: non-zero on error
+ *     
  */
-static void ciGetLeafPrefixKey(dtpage_t * lp, int li, dtpage_t * rp,
+static int ciGetLeafPrefixKey(dtpage_t * lp, int li, dtpage_t * rp,
                               int ri, struct component_name * key, int flag)
 {
        int klen, namlen;
        wchar_t *pl, *pr, *kname;
-       wchar_t lname[JFS_NAME_MAX + 1];
-       struct component_name lkey = { 0, lname };
-       wchar_t rname[JFS_NAME_MAX + 1];
-       struct component_name rkey = { 0, rname };
+       struct component_name lkey;
+       struct component_name rkey;
+
+       lkey.name = (wchar_t *) kmalloc((JFS_NAME_MAX + 1) * sizeof(wchar_t),
+                                       GFP_KERNEL);
+       if (lkey.name == NULL)
+               return -ENOSPC;
+
+       rkey.name = (wchar_t *) kmalloc((JFS_NAME_MAX + 1) * sizeof(wchar_t),
+                                       GFP_KERNEL);
+       if (rkey.name == NULL) {
+               kfree(lkey.name);
+               return -ENOSPC;
+       }
 
        /* get left and right key */
        dtGetKey(lp, li, &lkey, flag);
@@ -3749,7 +3781,7 @@ static void ciGetLeafPrefixKey(dtpage_t * lp, int li, dtpage_t * rp,
                *kname = *pr;
                if (*pl != *pr) {
                        key->namlen = klen + 1;
-                       return;
+                       goto free_names;
                }
        }
 
@@ -3760,7 +3792,10 @@ static void ciGetLeafPrefixKey(dtpage_t * lp, int li, dtpage_t * rp,
        } else                  /* l->namelen == r->namelen */
                key->namlen = klen;
 
-       return;
+free_names:
+       kfree(lkey.name);
+       kfree(rkey.name);
+       return 0;
 }