diff options
Diffstat (limited to 'fs/jfs')
-rw-r--r-- | fs/jfs/jfs_xtree.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/jfs/jfs_xtree.c b/fs/jfs/jfs_xtree.c index a7fe2f2b969f..e72f4ebb6e9c 100644 --- a/fs/jfs/jfs_xtree.c +++ b/fs/jfs/jfs_xtree.c | |||
@@ -3516,16 +3516,10 @@ s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag) | |||
3516 | /* process entries backward from last index */ | 3516 | /* process entries backward from last index */ |
3517 | index = le16_to_cpu(p->header.nextindex) - 1; | 3517 | index = le16_to_cpu(p->header.nextindex) - 1; |
3518 | 3518 | ||
3519 | if (p->header.flag & BT_INTERNAL) | ||
3520 | goto getChild; | ||
3521 | |||
3522 | /* | ||
3523 | * leaf page | ||
3524 | */ | ||
3525 | 3519 | ||
3526 | /* Since this is the rightmost leaf, and we may have already freed | 3520 | /* Since this is the rightmost page at this level, and we may have |
3527 | * a page that was formerly to the right, let's make sure that the | 3521 | * already freed a page that was formerly to the right, let's make |
3528 | * next pointer is zero. | 3522 | * sure that the next pointer is zero. |
3529 | */ | 3523 | */ |
3530 | if (p->header.next) { | 3524 | if (p->header.next) { |
3531 | if (log) | 3525 | if (log) |
@@ -3539,6 +3533,12 @@ s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag) | |||
3539 | p->header.next = 0; | 3533 | p->header.next = 0; |
3540 | } | 3534 | } |
3541 | 3535 | ||
3536 | if (p->header.flag & BT_INTERNAL) | ||
3537 | goto getChild; | ||
3538 | |||
3539 | /* | ||
3540 | * leaf page | ||
3541 | */ | ||
3542 | freed = 0; | 3542 | freed = 0; |
3543 | 3543 | ||
3544 | /* does region covered by leaf page precede Teof ? */ | 3544 | /* does region covered by leaf page precede Teof ? */ |