Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 10533
b: refs/heads/master
c: 7038f1c
h: refs/heads/master
i:
  10531: 7650ea8
v: v3
  • Loading branch information
Dave Kleikamp committed Oct 28, 2005
1 parent 3aa5de5 commit 8d8088b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b6a47fd8ff08a9d5cd279cdb8d97a619983575fa
refs/heads/master: 7038f1cbac899654cf0515e60dbe3e44d58271de
18 changes: 9 additions & 9 deletions trunk/fs/jfs/jfs_xtree.c
Original file line number Diff line number Diff line change
Expand Up @@ -3516,16 +3516,10 @@ s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag)
/* process entries backward from last index */
index = le16_to_cpu(p->header.nextindex) - 1;

if (p->header.flag & BT_INTERNAL)
goto getChild;

/*
* leaf page
*/

/* Since this is the rightmost leaf, and we may have already freed
* a page that was formerly to the right, let's make sure that the
* next pointer is zero.
/* Since this is the rightmost page at this level, and we may have
* already freed a page that was formerly to the right, let's make
* sure that the next pointer is zero.
*/
if (p->header.next) {
if (log)
Expand All @@ -3539,6 +3533,12 @@ s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag)
p->header.next = 0;
}

if (p->header.flag & BT_INTERNAL)
goto getChild;

/*
* leaf page
*/
freed = 0;

/* does region covered by leaf page precede Teof ? */
Expand Down

0 comments on commit 8d8088b

Please sign in to comment.