patch-2.4.13 linux/fs/reiserfs/bitmap.c
Next file: linux/fs/reiserfs/dir.c
Previous file: linux/fs/reiserfs/README
Back to the patch index
Back to the overall index
- Lines: 89
- Date:
Sun Oct 14 10:31:45 2001
- Orig file:
v2.4.12/linux/fs/reiserfs/bitmap.c
- Orig date:
Tue Oct 9 17:06:53 2001
diff -u --recursive --new-file v2.4.12/linux/fs/reiserfs/bitmap.c linux/fs/reiserfs/bitmap.c
@@ -116,7 +116,7 @@
reiserfs_prepare_for_journal(s, sbh, 1) ;
/* update super block */
- rs->s_free_blocks = cpu_to_le32 (le32_to_cpu (rs->s_free_blocks) + 1);
+ set_sb_free_blocks( rs, sb_free_blocks(rs) + 1 );
journal_mark_dirty (th, s, sbh);
s->s_dirt = 1;
@@ -304,8 +304,7 @@
/* We continue the while loop if another process snatches our found
* free block from us after we find it but before we successfully
- * mark it as in use, or if we need to use sync to free up some
- * blocks on the preserve list. */
+ * mark it as in use */
while (amount_needed--) {
/* skip over any blocknrs already gotten last time. */
@@ -405,26 +404,26 @@
reiserfs_prepare_for_journal(s, SB_BUFFER_WITH_SB(s), 1) ;
/* update free block count in super block */
- s->u.reiserfs_sb.s_rs->s_free_blocks = cpu_to_le32 (SB_FREE_BLOCKS (s) - init_amount_needed);
+ PUT_SB_FREE_BLOCKS( s, SB_FREE_BLOCKS(s) - init_amount_needed );
journal_mark_dirty (th, s, SB_BUFFER_WITH_SB (s));
s->s_dirt = 1;
return CARRY_ON;
}
-// this is called only by get_empty_nodes with for_preserve_list==0
+// this is called only by get_empty_nodes
int reiserfs_new_blocknrs (struct reiserfs_transaction_handle *th, unsigned long * free_blocknrs,
unsigned long search_start, int amount_needed) {
- return do_reiserfs_new_blocknrs(th, free_blocknrs, search_start, amount_needed, 0/*for_preserve_list-priority*/, 0/*for_formatted*/, 0/*for_prealloc */) ;
+ return do_reiserfs_new_blocknrs(th, free_blocknrs, search_start, amount_needed, 0/*priority*/, 0/*for_formatted*/, 0/*for_prealloc */) ;
}
-// called by get_new_buffer and by reiserfs_get_block with amount_needed == 1 and for_preserve_list == 0
+// called by get_new_buffer and by reiserfs_get_block with amount_needed == 1
int reiserfs_new_unf_blocknrs(struct reiserfs_transaction_handle *th, unsigned long * free_blocknrs,
unsigned long search_start) {
return do_reiserfs_new_blocknrs(th, free_blocknrs, search_start,
1/*amount_needed*/,
- 0/*for_preserve_list-priority*/,
+ 0/*priority*/,
1/*for formatted*/,
0/*for prealloc */) ;
}
@@ -478,14 +477,14 @@
** highest allocated oid, it is far from perfect, and files will tend
** to be grouped towards the start of the border
*/
- border = (INODE_PKEY(p_s_inode)->k_dir_id) % (SB_BLOCK_COUNT(th->t_super) - bstart - 1) ;
+ border = le32_to_cpu(INODE_PKEY(p_s_inode)->k_dir_id) % (SB_BLOCK_COUNT(th->t_super) - bstart - 1) ;
} else {
/* why would we want to delcare a local variable to this if statement
** name border????? -chris
** unsigned long border = 0;
*/
if (!reiserfs_hashed_relocation(th->t_super)) {
- hash_in = (INODE_PKEY(p_s_inode))->k_dir_id;
+ hash_in = le32_to_cpu((INODE_PKEY(p_s_inode))->k_dir_id);
/* I wonder if the CPU cost of the
hash will obscure the layout
effect? Of course, whether that
@@ -666,10 +665,10 @@
if (inode->u.reiserfs_i.i_prealloc_count < 0)
reiserfs_warning("zam-4001:" __FUNCTION__ ": inode has negative prealloc blocks count.\n");
#endif
- if (inode->u.reiserfs_i.i_prealloc_count > 0) {
+ if (inode->u.reiserfs_i.i_prealloc_count > 0) {
__discard_prealloc(th, inode);
}
-}
+ }
void reiserfs_discard_all_prealloc (struct reiserfs_transaction_handle *th)
{
@@ -684,6 +683,6 @@
}
#endif
__discard_prealloc(th, inode);
- }
+ }
}
#endif
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)