diff options
author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-09-12 13:25:14 -0400 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-09-12 13:34:54 -0400 |
commit | 164ae58c3c2a56e99d7ae207499f1fbd5e6f263d (patch) | |
tree | 97848b7ba5b4fdcf8d32aef5914cc1ba2eb14252 | |
parent | 84c9dee3adc2bc49a52af74f18378a4887448288 (diff) |
pNFS/blocklayout: Remove a couple of unused variables
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-rw-r--r-- | fs/nfs/blocklayout/blocklayout.c | 3 | ||||
-rw-r--r-- | fs/nfs/blocklayout/extent_tree.c | 2 |
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, | |||
694 | { | 694 | { |
695 | struct pnfs_block_layout *bl = BLK_LO2EXT(lo); | 695 | struct pnfs_block_layout *bl = BLK_LO2EXT(lo); |
696 | sector_t offset = range->offset >> SECTOR_SHIFT, end; | 696 | sector_t offset = range->offset >> SECTOR_SHIFT, end; |
697 | int err; | ||
698 | 697 | ||
699 | if (range->offset % 8) { | 698 | if (range->offset % 8) { |
700 | dprintk("%s: offset %lld not block size aligned\n", | 699 | dprintk("%s: offset %lld not block size aligned\n", |
@@ -714,7 +713,7 @@ bl_return_range(struct pnfs_layout_hdr *lo, | |||
714 | end = round_down(NFS4_MAX_UINT64, PAGE_SIZE); | 713 | end = round_down(NFS4_MAX_UINT64, PAGE_SIZE); |
715 | } | 714 | } |
716 | 715 | ||
717 | err = ext_tree_remove(bl, range->iomode & IOMODE_RW, offset, end); | 716 | ext_tree_remove(bl, range->iomode & IOMODE_RW, offset, end); |
718 | } | 717 | } |
719 | 718 | ||
720 | static int | 719 | 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) | |||
165 | { | 165 | { |
166 | struct pnfs_block_extent *be; | 166 | struct pnfs_block_extent *be; |
167 | sector_t len1 = 0, len2 = 0; | 167 | sector_t len1 = 0, len2 = 0; |
168 | sector_t orig_f_offset; | ||
169 | sector_t orig_v_offset; | 168 | sector_t orig_v_offset; |
170 | sector_t orig_len; | 169 | sector_t orig_len; |
171 | 170 | ||
@@ -175,7 +174,6 @@ __ext_tree_remove(struct rb_root *root, sector_t start, sector_t end) | |||
175 | if (be->be_f_offset >= end) | 174 | if (be->be_f_offset >= end) |
176 | return 0; | 175 | return 0; |
177 | 176 | ||
178 | orig_f_offset = be->be_f_offset; | ||
179 | orig_v_offset = be->be_v_offset; | 177 | orig_v_offset = be->be_v_offset; |
180 | orig_len = be->be_length; | 178 | orig_len = be->be_length; |
181 | 179 | ||