Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@penguin.transmeta.com>2002-03-07 00:51:47 -0800
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-03-07 00:51:47 -0800
commit639f87714e1a45e29647289cb2e81954ef1a5e7b (patch)
treedfeac73039fe120e5b05ec998130894c0174dae8
parent720e65f1e77d8a3fac5fc06f64f65f6045645b2d (diff)
parent7076f440a2f164a53ba12aaf9fca6705f5eb8fe2 (diff)
Automerge
-rw-r--r--fs/jfs/jfs_dtree.c22
1 files changed, 0 insertions, 22 deletions
diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c
index 725c1f20ac7d..3a8e77ca11b9 100644
--- a/fs/jfs/jfs_dtree.c
+++ b/fs/jfs/jfs_dtree.c
@@ -1927,22 +1927,6 @@ static int dtSplitRoot(tid_t tid,
release_metapage(mp);
}
/*
- * 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);
- }
- /*
* insert the new entry into the new right/child page
* (skip index in the new right page will not change)
*/
@@ -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) {
/*