diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 15:29:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 15:33:01 -0400 |
commit | e1c502482853f84606928f5a2f2eb6da1993cda1 (patch) | |
tree | ca296007164906342a195bdf3a5305277e6af5da /fs/reiserfs/ibalance.c | |
parent | 019abbc87025a030fd25008612afd4eff8a375f7 (diff) | |
parent | ee93961be1faddf9e9a638bc519145c20f0cfeba (diff) |
Merge branch 'reiserfs-updates' from Jeff Mahoney
* reiserfs-updates: (35 commits)
reiserfs: rename [cn]_* variables
reiserfs: rename p_._ variables
reiserfs: rename p_s_tb to tb
reiserfs: rename p_s_inode to inode
reiserfs: rename p_s_bh to bh
reiserfs: rename p_s_sb to sb
reiserfs: strip trailing whitespace
reiserfs: cleanup path functions
reiserfs: factor out buffer_info initialization
reiserfs: add atomic addition of selinux attributes during inode creation
reiserfs: use generic readdir for operations across all xattrs
reiserfs: journaled xattrs
reiserfs: use generic xattr handlers
reiserfs: remove i_has_xattr_dir
reiserfs: make per-inode xattr locking more fine grained
reiserfs: eliminate per-super xattr lock
reiserfs: simplify xattr internal file lookups/opens
reiserfs: Clean up xattrs when REISERFS_FS_XATTR is unset
reiserfs: remove IS_PRIVATE helpers
reiserfs: remove link detection code
...
Fixed up conflicts manually due to:
- quota name cleanups vs variable naming changes:
fs/reiserfs/inode.c
fs/reiserfs/namei.c
fs/reiserfs/stree.c
fs/reiserfs/xattr.c
- exported include header cleanups
include/linux/reiserfs_fs.h
Diffstat (limited to 'fs/reiserfs/ibalance.c')
-rw-r--r-- | fs/reiserfs/ibalance.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/fs/reiserfs/ibalance.c b/fs/reiserfs/ibalance.c index de391a82b999..2074fd95046b 100644 --- a/fs/reiserfs/ibalance.c +++ b/fs/reiserfs/ibalance.c | |||
@@ -105,8 +105,8 @@ static void internal_define_dest_src_infos(int shift_mode, | |||
105 | break; | 105 | break; |
106 | 106 | ||
107 | default: | 107 | default: |
108 | reiserfs_panic(tb->tb_sb, | 108 | reiserfs_panic(tb->tb_sb, "ibalance-1", |
109 | "internal_define_dest_src_infos: shift type is unknown (%d)", | 109 | "shift type is unknown (%d)", |
110 | shift_mode); | 110 | shift_mode); |
111 | } | 111 | } |
112 | } | 112 | } |
@@ -278,7 +278,7 @@ static void internal_delete_childs(struct buffer_info *cur_bi, int from, int n) | |||
278 | 278 | ||
279 | /* copy cpy_num node pointers and cpy_num - 1 items from buffer src to buffer dest | 279 | /* copy cpy_num node pointers and cpy_num - 1 items from buffer src to buffer dest |
280 | * last_first == FIRST_TO_LAST means, that we copy first items from src to tail of dest | 280 | * last_first == FIRST_TO_LAST means, that we copy first items from src to tail of dest |
281 | * last_first == LAST_TO_FIRST means, that we copy last items from src to head of dest | 281 | * last_first == LAST_TO_FIRST means, that we copy last items from src to head of dest |
282 | */ | 282 | */ |
283 | static void internal_copy_pointers_items(struct buffer_info *dest_bi, | 283 | static void internal_copy_pointers_items(struct buffer_info *dest_bi, |
284 | struct buffer_head *src, | 284 | struct buffer_head *src, |
@@ -385,7 +385,7 @@ static void internal_move_pointers_items(struct buffer_info *dest_bi, | |||
385 | if (last_first == FIRST_TO_LAST) { /* shift_left occurs */ | 385 | if (last_first == FIRST_TO_LAST) { /* shift_left occurs */ |
386 | first_pointer = 0; | 386 | first_pointer = 0; |
387 | first_item = 0; | 387 | first_item = 0; |
388 | /* delete cpy_num - del_par pointers and keys starting for pointers with first_pointer, | 388 | /* delete cpy_num - del_par pointers and keys starting for pointers with first_pointer, |
389 | for key - with first_item */ | 389 | for key - with first_item */ |
390 | internal_delete_pointers_items(src_bi, first_pointer, | 390 | internal_delete_pointers_items(src_bi, first_pointer, |
391 | first_item, cpy_num - del_par); | 391 | first_item, cpy_num - del_par); |
@@ -453,7 +453,7 @@ static void internal_insert_key(struct buffer_info *dest_bi, int dest_position_b | |||
453 | } | 453 | } |
454 | } | 454 | } |
455 | 455 | ||
456 | /* Insert d_key'th (delimiting) key from buffer cfl to tail of dest. | 456 | /* Insert d_key'th (delimiting) key from buffer cfl to tail of dest. |
457 | * Copy pointer_amount node pointers and pointer_amount - 1 items from buffer src to buffer dest. | 457 | * Copy pointer_amount node pointers and pointer_amount - 1 items from buffer src to buffer dest. |
458 | * Replace d_key'th key in buffer cfl. | 458 | * Replace d_key'th key in buffer cfl. |
459 | * Delete pointer_amount items and node pointers from buffer src. | 459 | * Delete pointer_amount items and node pointers from buffer src. |
@@ -518,7 +518,7 @@ static void internal_shift1_left(struct tree_balance *tb, | |||
518 | /* internal_move_pointers_items (tb->L[h], tb->S[h], FIRST_TO_LAST, pointer_amount, 1); */ | 518 | /* internal_move_pointers_items (tb->L[h], tb->S[h], FIRST_TO_LAST, pointer_amount, 1); */ |
519 | } | 519 | } |
520 | 520 | ||
521 | /* Insert d_key'th (delimiting) key from buffer cfr to head of dest. | 521 | /* Insert d_key'th (delimiting) key from buffer cfr to head of dest. |
522 | * Copy n node pointers and n - 1 items from buffer src to buffer dest. | 522 | * Copy n node pointers and n - 1 items from buffer src to buffer dest. |
523 | * Replace d_key'th key in buffer cfr. | 523 | * Replace d_key'th key in buffer cfr. |
524 | * Delete n items and node pointers from buffer src. | 524 | * Delete n items and node pointers from buffer src. |
@@ -702,8 +702,8 @@ static void balance_internal_when_delete(struct tree_balance *tb, | |||
702 | 702 | ||
703 | return; | 703 | return; |
704 | } | 704 | } |
705 | reiserfs_panic(tb->tb_sb, | 705 | reiserfs_panic(tb->tb_sb, "ibalance-2", |
706 | "balance_internal_when_delete: unexpected tb->lnum[%d]==%d or tb->rnum[%d]==%d", | 706 | "unexpected tb->lnum[%d]==%d or tb->rnum[%d]==%d", |
707 | h, tb->lnum[h], h, tb->rnum[h]); | 707 | h, tb->lnum[h], h, tb->rnum[h]); |
708 | } | 708 | } |
709 | 709 | ||
@@ -749,7 +749,7 @@ int balance_internal(struct tree_balance *tb, /* tree_balance structure | |||
749 | this means that new pointers and items must be inserted AFTER * | 749 | this means that new pointers and items must be inserted AFTER * |
750 | child_pos | 750 | child_pos |
751 | } | 751 | } |
752 | else | 752 | else |
753 | { | 753 | { |
754 | it is the position of the leftmost pointer that must be deleted (together with | 754 | it is the position of the leftmost pointer that must be deleted (together with |
755 | its corresponding key to the left of the pointer) | 755 | its corresponding key to the left of the pointer) |
@@ -940,8 +940,8 @@ int balance_internal(struct tree_balance *tb, /* tree_balance structure | |||
940 | struct block_head *blkh; | 940 | struct block_head *blkh; |
941 | 941 | ||
942 | if (tb->blknum[h] != 1) | 942 | if (tb->blknum[h] != 1) |
943 | reiserfs_panic(NULL, | 943 | reiserfs_panic(NULL, "ibalance-3", "One new node " |
944 | "balance_internal: One new node required for creating the new root"); | 944 | "required for creating the new root"); |
945 | /* S[h] = empty buffer from the list FEB. */ | 945 | /* S[h] = empty buffer from the list FEB. */ |
946 | tbSh = get_FEB(tb); | 946 | tbSh = get_FEB(tb); |
947 | blkh = B_BLK_HEAD(tbSh); | 947 | blkh = B_BLK_HEAD(tbSh); |