aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/extent_io.c
diff options
context:
space:
mode:
authorAndi Kleen <andi@firstfloor.org>2010-10-29 15:14:37 -0400
committerChris Mason <chris.mason@oracle.com>2010-10-29 15:14:37 -0400
commit559af8211433b8c0b20e6c43c61409cb9c9c2996 (patch)
tree702ebd4c4f5b610daa36f65d814a518356a9a46b /fs/btrfs/extent_io.c
parent411fc6bcef54f828a5458f4730c68abdf13c6bf0 (diff)
Btrfs: cleanup warnings from gcc 4.6 (nonbugs)
These are all the cases where a variable is set, but not read which are not bugs as far as I can see, but simply leftovers. Still needs more review. Found by gcc 4.6's new warnings Signed-off-by: Andi Kleen <ak@linux.intel.com> Cc: Chris Mason <chris.mason@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/extent_io.c')
-rw-r--r--fs/btrfs/extent_io.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 7dc31c39ca59..3b7eaee0f912 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1857,10 +1857,8 @@ static int submit_one_bio(int rw, struct bio *bio, int mirror_num,
1857 struct page *page = bvec->bv_page; 1857 struct page *page = bvec->bv_page;
1858 struct extent_io_tree *tree = bio->bi_private; 1858 struct extent_io_tree *tree = bio->bi_private;
1859 u64 start; 1859 u64 start;
1860 u64 end;
1861 1860
1862 start = ((u64)page->index << PAGE_CACHE_SHIFT) + bvec->bv_offset; 1861 start = ((u64)page->index << PAGE_CACHE_SHIFT) + bvec->bv_offset;
1863 end = start + bvec->bv_len - 1;
1864 1862
1865 bio->bi_private = NULL; 1863 bio->bi_private = NULL;
1866 1864
@@ -2160,7 +2158,6 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,
2160 u64 last_byte = i_size_read(inode); 2158 u64 last_byte = i_size_read(inode);
2161 u64 block_start; 2159 u64 block_start;
2162 u64 iosize; 2160 u64 iosize;
2163 u64 unlock_start;
2164 sector_t sector; 2161 sector_t sector;
2165 struct extent_state *cached_state = NULL; 2162 struct extent_state *cached_state = NULL;
2166 struct extent_map *em; 2163 struct extent_map *em;
@@ -2285,7 +2282,6 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,
2285 if (tree->ops && tree->ops->writepage_end_io_hook) 2282 if (tree->ops && tree->ops->writepage_end_io_hook)
2286 tree->ops->writepage_end_io_hook(page, start, 2283 tree->ops->writepage_end_io_hook(page, start,
2287 page_end, NULL, 1); 2284 page_end, NULL, 1);
2288 unlock_start = page_end + 1;
2289 goto done; 2285 goto done;
2290 } 2286 }
2291 2287
@@ -2296,7 +2292,6 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,
2296 if (tree->ops && tree->ops->writepage_end_io_hook) 2292 if (tree->ops && tree->ops->writepage_end_io_hook)
2297 tree->ops->writepage_end_io_hook(page, cur, 2293 tree->ops->writepage_end_io_hook(page, cur,
2298 page_end, NULL, 1); 2294 page_end, NULL, 1);
2299 unlock_start = page_end + 1;
2300 break; 2295 break;
2301 } 2296 }
2302 em = epd->get_extent(inode, page, pg_offset, cur, 2297 em = epd->get_extent(inode, page, pg_offset, cur,
@@ -2343,7 +2338,6 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,
2343 2338
2344 cur += iosize; 2339 cur += iosize;
2345 pg_offset += iosize; 2340 pg_offset += iosize;
2346 unlock_start = cur;
2347 continue; 2341 continue;
2348 } 2342 }
2349 /* leave this out until we have a page_mkwrite call */ 2343 /* leave this out until we have a page_mkwrite call */
@@ -2429,7 +2423,6 @@ static int extent_write_cache_pages(struct extent_io_tree *tree,
2429 pgoff_t index; 2423 pgoff_t index;
2430 pgoff_t end; /* Inclusive */ 2424 pgoff_t end; /* Inclusive */
2431 int scanned = 0; 2425 int scanned = 0;
2432 int range_whole = 0;
2433 2426
2434 pagevec_init(&pvec, 0); 2427 pagevec_init(&pvec, 0);
2435 if (wbc->range_cyclic) { 2428 if (wbc->range_cyclic) {
@@ -2438,8 +2431,6 @@ static int extent_write_cache_pages(struct extent_io_tree *tree,
2438 } else { 2431 } else {
2439 index = wbc->range_start >> PAGE_CACHE_SHIFT; 2432 index = wbc->range_start >> PAGE_CACHE_SHIFT;
2440 end = wbc->range_end >> PAGE_CACHE_SHIFT; 2433 end = wbc->range_end >> PAGE_CACHE_SHIFT;
2441 if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
2442 range_whole = 1;
2443 scanned = 1; 2434 scanned = 1;
2444 } 2435 }
2445retry: 2436retry: