btrfs: rename variables clashing with global function names

reported by gcc -Wshadow:
page_index, page_offset, new_inode, dev_name

Signed-off-by: David Sterba <dsterba@suse.cz>

1 files changed, 21 insertions, 21 deletions

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 41d1d7c70e29..d4cd0f0cd695 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -332,7 +332,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,
         struct compressed_bio *cb;
         unsigned long bytes_left;
         struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;
-        int page_index = 0;
+        int pg_index = 0;
         struct page *page;
         u64 first_byte = disk_start;
         struct block_device *bdev;
@@ -366,8 +366,8 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start,
 
         /* create and submit bios for the compressed pages */
         bytes_left = compressed_len;
-        for (page_index = 0; page_index < cb->nr_pages; page_index++) {
-                page = compressed_pages[page_index];
+        for (pg_index = 0; pg_index < cb->nr_pages; pg_index++) {
+                page = compressed_pages[pg_index];
                 page->mapping = inode->i_mapping;
                 if (bio->bi_size)
                         ret = io_tree->ops->merge_bio_hook(page, 0,
@@ -432,7 +432,7 @@ static noinline int add_ra_bio_pages(struct inode *inode,
                                      struct compressed_bio *cb)
 {
         unsigned long end_index;
-        unsigned long page_index;
+        unsigned long pg_index;
         u64 last_offset;
         u64 isize = i_size_read(inode);
         int ret;
@@ -456,13 +456,13 @@ static noinline int add_ra_bio_pages(struct inode *inode,
         end_index = (i_size_read(inode) - 1) >> PAGE_CACHE_SHIFT;
 
         while (last_offset < compressed_end) {
-                page_index = last_offset >> PAGE_CACHE_SHIFT;
+                pg_index = last_offset >> PAGE_CACHE_SHIFT;
 
-                if (page_index > end_index)
+                if (pg_index > end_index)
                         break;
 
                 rcu_read_lock();
-                page = radix_tree_lookup(&mapping->page_tree, page_index);
+                page = radix_tree_lookup(&mapping->page_tree, pg_index);
                 rcu_read_unlock();
                 if (page) {
                         misses++;
@@ -476,7 +476,7 @@ static noinline int add_ra_bio_pages(struct inode *inode,
                 if (!page)
                         break;
 
-                if (add_to_page_cache_lru(page, mapping, page_index,
+                if (add_to_page_cache_lru(page, mapping, pg_index,
                                                                 GFP_NOFS)) {
                         page_cache_release(page);
                         goto next;
@@ -560,7 +560,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
         unsigned long uncompressed_len = bio->bi_vcnt * PAGE_CACHE_SIZE;
         unsigned long compressed_len;
         unsigned long nr_pages;
-        unsigned long page_index;
+        unsigned long pg_index;
         struct page *page;
         struct block_device *bdev;
         struct bio *comp_bio;
@@ -613,10 +613,10 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
 
         bdev = BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev;
 
-        for (page_index = 0; page_index < nr_pages; page_index++) {
-                cb->compressed_pages[page_index] = alloc_page(GFP_NOFS |
+        for (pg_index = 0; pg_index < nr_pages; pg_index++) {
+                cb->compressed_pages[pg_index] = alloc_page(GFP_NOFS |
                                                               __GFP_HIGHMEM);
-                if (!cb->compressed_pages[page_index])
+                if (!cb->compressed_pages[pg_index])
                         goto fail2;
         }
         cb->nr_pages = nr_pages;
@@ -634,8 +634,8 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
         comp_bio->bi_end_io = end_compressed_bio_read;
         atomic_inc(&cb->pending_bios);
 
-        for (page_index = 0; page_index < nr_pages; page_index++) {
-                page = cb->compressed_pages[page_index];
+        for (pg_index = 0; pg_index < nr_pages; pg_index++) {
+                page = cb->compressed_pages[pg_index];
                 page->mapping = inode->i_mapping;
                 page->index = em_start >> PAGE_CACHE_SHIFT;
 
@@ -702,8 +702,8 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
         return 0;
 
 fail2:
-        for (page_index = 0; page_index < nr_pages; page_index++)
-                free_page((unsigned long)cb->compressed_pages[page_index]);
+        for (pg_index = 0; pg_index < nr_pages; pg_index++)
+                free_page((unsigned long)cb->compressed_pages[pg_index]);
 
         kfree(cb->compressed_pages);
 fail1:
@@ -945,7 +945,7 @@ void btrfs_exit_compress(void)
 int btrfs_decompress_buf2page(char *buf, unsigned long buf_start,
                               unsigned long total_out, u64 disk_start,
                               struct bio_vec *bvec, int vcnt,
-                              unsigned long *page_index,
+                              unsigned long *pg_index,
                               unsigned long *pg_offset)
 {
         unsigned long buf_offset;
@@ -954,7 +954,7 @@ int btrfs_decompress_buf2page(char *buf, unsigned long buf_start,
         unsigned long working_bytes = total_out - buf_start;
         unsigned long bytes;
         char *kaddr;
-        struct page *page_out = bvec[*page_index].bv_page;
+        struct page *page_out = bvec[*pg_index].bv_page;
 
         /*
          * start byte is the first byte of the page we're currently
@@ -995,11 +995,11 @@ int btrfs_decompress_buf2page(char *buf, unsigned long buf_start,
 
                 /* check if we need to pick another page */
                 if (*pg_offset == PAGE_CACHE_SIZE) {
-                        (*page_index)++;
-                        if (*page_index >= vcnt)
+                        (*pg_index)++;
+                        if (*pg_index >= vcnt)
                                 return 0;
 
-                        page_out = bvec[*page_index].bv_page;
+                        page_out = bvec[*pg_index].bv_page;
                         *pg_offset = 0;
                         start_byte = page_offset(page_out) - disk_start;