summaryrefslogtreecommitdiffstats
path: root/fs/nfs/blocklayout
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2014-09-12 13:25:14 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2014-09-12 13:34:54 -0400
commit164ae58c3c2a56e99d7ae207499f1fbd5e6f263d (patch)
tree97848b7ba5b4fdcf8d32aef5914cc1ba2eb14252 /fs/nfs/blocklayout
parent84c9dee3adc2bc49a52af74f18378a4887448288 (diff)
downloadlinux-stable-164ae58c3c2a56e99d7ae207499f1fbd5e6f263d.tar.gz
linux-stable-164ae58c3c2a56e99d7ae207499f1fbd5e6f263d.tar.bz2
linux-stable-164ae58c3c2a56e99d7ae207499f1fbd5e6f263d.zip
pNFS/blocklayout: Remove a couple of unused variables
Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/blocklayout')
-rw-r--r--fs/nfs/blocklayout/blocklayout.c3
-rw-r--r--fs/nfs/blocklayout/extent_tree.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
index c41a718854e3..5228f201d3d5 100644
--- 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;
- int err;
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);
}
- err = ext_tree_remove(bl, range->iomode & IOMODE_RW, offset, end);
+ ext_tree_remove(bl, range->iomode & IOMODE_RW, offset, end);
}
static int
diff --git a/fs/nfs/blocklayout/extent_tree.c b/fs/nfs/blocklayout/extent_tree.c
index 1b6009ee75ce..93193616205a 100644
--- 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;
- sector_t orig_f_offset;
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;
- orig_f_offset = be->be_f_offset;
orig_v_offset = be->be_v_offset;
orig_len = be->be_length;