pNFS/blocklayout: Remove a couple of unused variables

Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
index c41a718854e32dfd0900175e0221ea358481b368..5228f201d3d53ed93966bc99e682077b9c78f107 100644 (file)
--- a/fs/nfs/blocklayout/blocklayout.c
+++ b/fs/nfs/blocklayout/blocklayout.c
@@ -694,7 +694,6 @@ bl_return_range(struct pnfs_layout_hdr *lo,
 {
        struct pnfs_block_layout *bl = BLK_LO2EXT(lo);
        sector_t offset = range->offset >> SECTOR_SHIFT, end;
 {
        struct pnfs_block_layout *bl = BLK_LO2EXT(lo);
        sector_t offset = range->offset >> SECTOR_SHIFT, end;

-       int err;

 
        if (range->offset % 8) {
                dprintk("%s: offset %lld not block size aligned\n",
 
        if (range->offset % 8) {
                dprintk("%s: offset %lld not block size aligned\n",


@@ -714,7 +713,7 @@ bl_return_range(struct pnfs_layout_hdr *lo,
                end = round_down(NFS4_MAX_UINT64, PAGE_SIZE);
        }
 
                end = round_down(NFS4_MAX_UINT64, PAGE_SIZE);
        }
 

-       err = ext_tree_remove(bl, range->iomode & IOMODE_RW, offset, end);
+       ext_tree_remove(bl, range->iomode & IOMODE_RW, offset, end);

 }
 
 static int
 }
 
 static int

diff --git a/fs/nfs/blocklayout/extent_tree.c b/fs/nfs/blocklayout/extent_tree.c
index 1b6009ee75ce9a27f8875f4b519cb49159edb164..93193616205a6bc39d88addf6a5b3ac1b6fda237 100644 (file)
--- a/fs/nfs/blocklayout/extent_tree.c
+++ b/fs/nfs/blocklayout/extent_tree.c
@@ -165,7 +165,6 @@ __ext_tree_remove(struct rb_root *root, sector_t start, sector_t end)
 {
        struct pnfs_block_extent *be;
        sector_t len1 = 0, len2 = 0;
 {
        struct pnfs_block_extent *be;
        sector_t len1 = 0, len2 = 0;

-       sector_t orig_f_offset;

        sector_t orig_v_offset;
        sector_t orig_len;
 
        sector_t orig_v_offset;
        sector_t orig_len;
 


@@ -175,7 +174,6 @@ __ext_tree_remove(struct rb_root *root, sector_t start, sector_t end)
        if (be->be_f_offset >= end)
                return 0;
 
        if (be->be_f_offset >= end)
                return 0;
 

-       orig_f_offset = be->be_f_offset;

        orig_v_offset = be->be_v_offset;
        orig_len = be->be_length;
 
        orig_v_offset = be->be_v_offset;
        orig_len = be->be_length;