diff options
Diffstat (limited to 'fs/reiserfs/bitmap.c')
-rw-r--r-- | fs/reiserfs/bitmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c index f491ceb5af02..4646caa60455 100644 --- a/fs/reiserfs/bitmap.c +++ b/fs/reiserfs/bitmap.c | |||
@@ -479,7 +479,7 @@ static void __discard_prealloc(struct reiserfs_transaction_handle *th, | |||
479 | if (ei->i_prealloc_count < 0) | 479 | if (ei->i_prealloc_count < 0) |
480 | reiserfs_warning(th->t_super, | 480 | reiserfs_warning(th->t_super, |
481 | "zam-4001:%s: inode has negative prealloc blocks count.", | 481 | "zam-4001:%s: inode has negative prealloc blocks count.", |
482 | __FUNCTION__); | 482 | __func__); |
483 | #endif | 483 | #endif |
484 | while (ei->i_prealloc_count > 0) { | 484 | while (ei->i_prealloc_count > 0) { |
485 | reiserfs_free_prealloc_block(th, inode, ei->i_prealloc_block); | 485 | reiserfs_free_prealloc_block(th, inode, ei->i_prealloc_block); |
@@ -517,7 +517,7 @@ void reiserfs_discard_all_prealloc(struct reiserfs_transaction_handle *th) | |||
517 | if (!ei->i_prealloc_count) { | 517 | if (!ei->i_prealloc_count) { |
518 | reiserfs_warning(th->t_super, | 518 | reiserfs_warning(th->t_super, |
519 | "zam-4001:%s: inode is in prealloc list but has no preallocated blocks.", | 519 | "zam-4001:%s: inode is in prealloc list but has no preallocated blocks.", |
520 | __FUNCTION__); | 520 | __func__); |
521 | } | 521 | } |
522 | #endif | 522 | #endif |
523 | __discard_prealloc(th, ei); | 523 | __discard_prealloc(th, ei); |
@@ -632,7 +632,7 @@ int reiserfs_parse_alloc_options(struct super_block *s, char *options) | |||
632 | } | 632 | } |
633 | 633 | ||
634 | reiserfs_warning(s, "zam-4001: %s : unknown option - %s", | 634 | reiserfs_warning(s, "zam-4001: %s : unknown option - %s", |
635 | __FUNCTION__, this_char); | 635 | __func__, this_char); |
636 | return 1; | 636 | return 1; |
637 | } | 637 | } |
638 | 638 | ||
@@ -1254,7 +1254,7 @@ struct buffer_head *reiserfs_read_bitmap_block(struct super_block *sb, | |||
1254 | bh = sb_bread(sb, block); | 1254 | bh = sb_bread(sb, block); |
1255 | if (bh == NULL) | 1255 | if (bh == NULL) |
1256 | reiserfs_warning(sb, "sh-2029: %s: bitmap block (#%u) " | 1256 | reiserfs_warning(sb, "sh-2029: %s: bitmap block (#%u) " |
1257 | "reading failed", __FUNCTION__, block); | 1257 | "reading failed", __func__, block); |
1258 | else { | 1258 | else { |
1259 | if (buffer_locked(bh)) { | 1259 | if (buffer_locked(bh)) { |
1260 | PROC_INFO_INC(sb, scan_bitmap.wait); | 1260 | PROC_INFO_INC(sb, scan_bitmap.wait); |