diff options
Diffstat (limited to 'fs/ntfs/aops.c')
-rw-r--r-- | fs/ntfs/aops.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c index bc579bfdfbd8..7b2c8f4f6a6f 100644 --- a/fs/ntfs/aops.c +++ b/fs/ntfs/aops.c | |||
@@ -254,7 +254,7 @@ static int ntfs_read_block(struct page *page) | |||
254 | bh->b_bdev = vol->sb->s_bdev; | 254 | bh->b_bdev = vol->sb->s_bdev; |
255 | /* Is the block within the allowed limits? */ | 255 | /* Is the block within the allowed limits? */ |
256 | if (iblock < lblock) { | 256 | if (iblock < lblock) { |
257 | BOOL is_retry = FALSE; | 257 | bool is_retry = false; |
258 | 258 | ||
259 | /* Convert iblock into corresponding vcn and offset. */ | 259 | /* Convert iblock into corresponding vcn and offset. */ |
260 | vcn = (VCN)iblock << blocksize_bits >> | 260 | vcn = (VCN)iblock << blocksize_bits >> |
@@ -292,7 +292,7 @@ lock_retry_remap: | |||
292 | goto handle_hole; | 292 | goto handle_hole; |
293 | /* If first try and runlist unmapped, map and retry. */ | 293 | /* If first try and runlist unmapped, map and retry. */ |
294 | if (!is_retry && lcn == LCN_RL_NOT_MAPPED) { | 294 | if (!is_retry && lcn == LCN_RL_NOT_MAPPED) { |
295 | is_retry = TRUE; | 295 | is_retry = true; |
296 | /* | 296 | /* |
297 | * Attempt to map runlist, dropping lock for | 297 | * Attempt to map runlist, dropping lock for |
298 | * the duration. | 298 | * the duration. |
@@ -558,7 +558,7 @@ static int ntfs_write_block(struct page *page, struct writeback_control *wbc) | |||
558 | unsigned long flags; | 558 | unsigned long flags; |
559 | unsigned int blocksize, vcn_ofs; | 559 | unsigned int blocksize, vcn_ofs; |
560 | int err; | 560 | int err; |
561 | BOOL need_end_writeback; | 561 | bool need_end_writeback; |
562 | unsigned char blocksize_bits; | 562 | unsigned char blocksize_bits; |
563 | 563 | ||
564 | vi = page->mapping->host; | 564 | vi = page->mapping->host; |
@@ -626,7 +626,7 @@ static int ntfs_write_block(struct page *page, struct writeback_control *wbc) | |||
626 | rl = NULL; | 626 | rl = NULL; |
627 | err = 0; | 627 | err = 0; |
628 | do { | 628 | do { |
629 | BOOL is_retry = FALSE; | 629 | bool is_retry = false; |
630 | 630 | ||
631 | if (unlikely(block >= dblock)) { | 631 | if (unlikely(block >= dblock)) { |
632 | /* | 632 | /* |
@@ -768,7 +768,7 @@ lock_retry_remap: | |||
768 | } | 768 | } |
769 | /* If first try and runlist unmapped, map and retry. */ | 769 | /* If first try and runlist unmapped, map and retry. */ |
770 | if (!is_retry && lcn == LCN_RL_NOT_MAPPED) { | 770 | if (!is_retry && lcn == LCN_RL_NOT_MAPPED) { |
771 | is_retry = TRUE; | 771 | is_retry = true; |
772 | /* | 772 | /* |
773 | * Attempt to map runlist, dropping lock for | 773 | * Attempt to map runlist, dropping lock for |
774 | * the duration. | 774 | * the duration. |
@@ -874,12 +874,12 @@ lock_retry_remap: | |||
874 | set_page_writeback(page); /* Keeps try_to_free_buffers() away. */ | 874 | set_page_writeback(page); /* Keeps try_to_free_buffers() away. */ |
875 | 875 | ||
876 | /* Submit the prepared buffers for i/o. */ | 876 | /* Submit the prepared buffers for i/o. */ |
877 | need_end_writeback = TRUE; | 877 | need_end_writeback = true; |
878 | do { | 878 | do { |
879 | struct buffer_head *next = bh->b_this_page; | 879 | struct buffer_head *next = bh->b_this_page; |
880 | if (buffer_async_write(bh)) { | 880 | if (buffer_async_write(bh)) { |
881 | submit_bh(WRITE, bh); | 881 | submit_bh(WRITE, bh); |
882 | need_end_writeback = FALSE; | 882 | need_end_writeback = false; |
883 | } | 883 | } |
884 | bh = next; | 884 | bh = next; |
885 | } while (bh != head); | 885 | } while (bh != head); |
@@ -932,7 +932,7 @@ static int ntfs_write_mst_block(struct page *page, | |||
932 | runlist_element *rl; | 932 | runlist_element *rl; |
933 | int i, nr_locked_nis, nr_recs, nr_bhs, max_bhs, bhs_per_rec, err, err2; | 933 | int i, nr_locked_nis, nr_recs, nr_bhs, max_bhs, bhs_per_rec, err, err2; |
934 | unsigned bh_size, rec_size_bits; | 934 | unsigned bh_size, rec_size_bits; |
935 | BOOL sync, is_mft, page_is_dirty, rec_is_dirty; | 935 | bool sync, is_mft, page_is_dirty, rec_is_dirty; |
936 | unsigned char bh_size_bits; | 936 | unsigned char bh_size_bits; |
937 | 937 | ||
938 | ntfs_debug("Entering for inode 0x%lx, attribute type 0x%x, page index " | 938 | ntfs_debug("Entering for inode 0x%lx, attribute type 0x%x, page index " |
@@ -975,10 +975,10 @@ static int ntfs_write_mst_block(struct page *page, | |||
975 | 975 | ||
976 | rl = NULL; | 976 | rl = NULL; |
977 | err = err2 = nr_bhs = nr_recs = nr_locked_nis = 0; | 977 | err = err2 = nr_bhs = nr_recs = nr_locked_nis = 0; |
978 | page_is_dirty = rec_is_dirty = FALSE; | 978 | page_is_dirty = rec_is_dirty = false; |
979 | rec_start_bh = NULL; | 979 | rec_start_bh = NULL; |
980 | do { | 980 | do { |
981 | BOOL is_retry = FALSE; | 981 | bool is_retry = false; |
982 | 982 | ||
983 | if (likely(block < rec_block)) { | 983 | if (likely(block < rec_block)) { |
984 | if (unlikely(block >= dblock)) { | 984 | if (unlikely(block >= dblock)) { |
@@ -1009,10 +1009,10 @@ static int ntfs_write_mst_block(struct page *page, | |||
1009 | } | 1009 | } |
1010 | if (!buffer_dirty(bh)) { | 1010 | if (!buffer_dirty(bh)) { |
1011 | /* Clean records are not written out. */ | 1011 | /* Clean records are not written out. */ |
1012 | rec_is_dirty = FALSE; | 1012 | rec_is_dirty = false; |
1013 | continue; | 1013 | continue; |
1014 | } | 1014 | } |
1015 | rec_is_dirty = TRUE; | 1015 | rec_is_dirty = true; |
1016 | rec_start_bh = bh; | 1016 | rec_start_bh = bh; |
1017 | } | 1017 | } |
1018 | /* Need to map the buffer if it is not mapped already. */ | 1018 | /* Need to map the buffer if it is not mapped already. */ |
@@ -1053,7 +1053,7 @@ lock_retry_remap: | |||
1053 | */ | 1053 | */ |
1054 | if (!is_mft && !is_retry && | 1054 | if (!is_mft && !is_retry && |
1055 | lcn == LCN_RL_NOT_MAPPED) { | 1055 | lcn == LCN_RL_NOT_MAPPED) { |
1056 | is_retry = TRUE; | 1056 | is_retry = true; |
1057 | /* | 1057 | /* |
1058 | * Attempt to map runlist, dropping | 1058 | * Attempt to map runlist, dropping |
1059 | * lock for the duration. | 1059 | * lock for the duration. |
@@ -1063,7 +1063,7 @@ lock_retry_remap: | |||
1063 | if (likely(!err2)) | 1063 | if (likely(!err2)) |
1064 | goto lock_retry_remap; | 1064 | goto lock_retry_remap; |
1065 | if (err2 == -ENOMEM) | 1065 | if (err2 == -ENOMEM) |
1066 | page_is_dirty = TRUE; | 1066 | page_is_dirty = true; |
1067 | lcn = err2; | 1067 | lcn = err2; |
1068 | } else { | 1068 | } else { |
1069 | err2 = -EIO; | 1069 | err2 = -EIO; |
@@ -1145,7 +1145,7 @@ lock_retry_remap: | |||
1145 | * means we need to redirty the page before | 1145 | * means we need to redirty the page before |
1146 | * returning. | 1146 | * returning. |
1147 | */ | 1147 | */ |
1148 | page_is_dirty = TRUE; | 1148 | page_is_dirty = true; |
1149 | /* | 1149 | /* |
1150 | * Remove the buffers in this mft record from | 1150 | * Remove the buffers in this mft record from |
1151 | * the list of buffers to write. | 1151 | * the list of buffers to write. |