]> git.neil.brown.name Git - history.git/commitdiff
Remove duplicate code in jfs_dtree.c.
authorDave Kleikamp <shaggy@kleikamp.austin.ibm.com>
Wed, 6 Mar 2002 08:56:34 +0000 (02:56 -0600)
committerDave Kleikamp <shaggy@kleikamp.austin.ibm.com>
Wed, 6 Mar 2002 08:56:34 +0000 (02:56 -0600)
It looks like I had applied a patch to the code twice, and both succeeded.

fs/jfs/jfs_dtree.c

index 725c1f20ac7db87bacd55364d1f8e3a196f75f9b..3a8e77ca11b9c0a61aa3a318db9719bc6624cd6c 100644 (file)
@@ -1910,22 +1910,6 @@ static int dtSplitRoot(tid_t tid,
 
        rp->header.freecnt = sp->header.freecnt + rp->header.maxslot - n;
 
-       /*
-        * Update directory index table for entries now in right page
-        */
-       if ((rp->header.flag & BT_LEAF) && DO_INDEX(ip)) {
-               metapage_t *mp = 0;
-               ldtentry_t *ldtentry;
-
-               stbl = DT_GETSTBL(rp);
-               for (n = 0; n < rp->header.nextindex; n++) {
-                       ldtentry = (ldtentry_t *) & rp->slot[stbl[n]];
-                       modify_index(tid, ip, le32_to_cpu(ldtentry->index),
-                                    rbn, n, &mp);
-               }
-               if (mp)
-                       release_metapage(mp);
-       }
        /*
         * Update directory index table for entries now in right page
         */
@@ -2940,12 +2924,6 @@ int jfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                                filp->f_pos = -1;
                                return 0;
                        }
-                       if (p->header.flag & BT_INTERNAL) {
-                               jERROR(1,("jfs_readdir: bad index table\n"));
-                               DT_PUTPAGE(mp);
-                               filp->f_pos = -1;
-                               return 0;
-                       }
                } else {
                        if (dir_index == 0) {
                                /*