git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB (9398): Initial support for the Technotrend TT S2 3200
[safe/jmp/linux-2.6]
/
fs
/
reiserfs
/
stree.c
diff --git
a/fs/reiserfs/stree.c
b/fs/reiserfs/stree.c
index
b6f1259
..
abbc64d
100644
(file)
--- a/
fs/reiserfs/stree.c
+++ b/
fs/reiserfs/stree.c
@@
-559,7
+559,7
@@
static int is_tree_node(struct buffer_head *bh, int level)
/* The function is NOT SCHEDULE-SAFE! */
static void search_by_key_reada(struct super_block *s,
struct buffer_head **bh,
/* The function is NOT SCHEDULE-SAFE! */
static void search_by_key_reada(struct super_block *s,
struct buffer_head **bh,
-
unsigned long
*b, int num)
+
b_blocknr_t
*b, int num)
{
int i, j;
{
int i, j;
@@
-611,7
+611,7
@@
int search_by_key(struct super_block *p_s_sb, const struct cpu_key *p_s_key, /*
DISK_LEAF_NODE_LEVEL */
)
{
DISK_LEAF_NODE_LEVEL */
)
{
-
in
t n_block_number;
+
b_blocknr_
t n_block_number;
int expected_level;
struct buffer_head *p_s_bh;
struct path_element *p_s_last_element;
int expected_level;
struct buffer_head *p_s_bh;
struct path_element *p_s_last_element;
@@
-619,7
+619,7
@@
int search_by_key(struct super_block *p_s_sb, const struct cpu_key *p_s_key, /*
int right_neighbor_of_leaf_node;
int fs_gen;
struct buffer_head *reada_bh[SEARCH_BY_KEY_READA];
int right_neighbor_of_leaf_node;
int fs_gen;
struct buffer_head *reada_bh[SEARCH_BY_KEY_READA];
-
unsigned long
reada_blocks[SEARCH_BY_KEY_READA];
+
b_blocknr_t
reada_blocks[SEARCH_BY_KEY_READA];
int reada_count = 0;
#ifdef CONFIG_REISERFS_CHECK
int reada_count = 0;
#ifdef CONFIG_REISERFS_CHECK
@@
-1042,7
+1042,8
@@
static char prepare_for_delete_or_cut(struct reiserfs_transaction_handle *th, st
pos = I_UNFM_NUM(&s_ih);
while (le_ih_k_offset (&s_ih) + (pos - 1) * blk_size > n_new_file_length) {
pos = I_UNFM_NUM(&s_ih);
while (le_ih_k_offset (&s_ih) + (pos - 1) * blk_size > n_new_file_length) {
- __u32 *unfm, block;
+ __le32 *unfm;
+ __u32 block;
/* Each unformatted block deletion may involve one additional
* bitmap block into the transaction, thereby the initial
/* Each unformatted block deletion may involve one additional
* bitmap block into the transaction, thereby the initial
@@
-1052,7
+1053,7
@@
static char prepare_for_delete_or_cut(struct reiserfs_transaction_handle *th, st
break;
}
break;
}
- unfm = (__
u
32 *)B_I_PITEM(p_s_bh, &s_ih) + pos - 1;
+ unfm = (__
le
32 *)B_I_PITEM(p_s_bh, &s_ih) + pos - 1;
block = get_block_num(unfm, 0);
if (block != 0) {
block = get_block_num(unfm, 0);
if (block != 0) {
@@
-1418,8
+1419,7
@@
int reiserfs_delete_object(struct reiserfs_transaction_handle *th,
inode_generation =
&REISERFS_SB(th->t_super)->s_rs->s_inode_generation;
inode_generation =
&REISERFS_SB(th->t_super)->s_rs->s_inode_generation;
- *inode_generation =
- cpu_to_le32(le32_to_cpu(*inode_generation) + 1);
+ le32_add_cpu(inode_generation, 1);
}
/* USE_INODE_GENERATION_COUNTER */
#endif
}
/* USE_INODE_GENERATION_COUNTER */
#endif
@@
-1457,9
+1457,6
@@
static void unmap_buffers(struct page *page, loff_t pos)
}
bh = next;
} while (bh != head);
}
bh = next;
} while (bh != head);
- if (PAGE_SIZE == bh->b_size) {
- cancel_dirty_page(page, PAGE_CACHE_SIZE);
- }
}
}
}
}
}
}