mds: fix compile error from merges

Two patches both added these definitions
in slightly different places, so git let them
merge without a conflict.

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index b26689925c0c12a0182a3e62f3fc7d68482978be..2ac7544f3f95280a8040e1725d168287999c9465 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -3819,8 +3819,6 @@ void CInode::validate_disk_state(CInode::validated_data *results,
       // Ignore rval because it's the result of a FAILOK operation
       // from fetch_backtrace_and_tag: the real result is in
       // backtrace.ondisk_read_retval
-      MDCache *mdcache = in->mdcache;
-      const inode_t& inode = in->inode;
       dout(20) << "ondisk_read_retval: " << results->backtrace.ondisk_read_retval << dendl;
       if (results->backtrace.ondisk_read_retval != 0) {
         results->backtrace.error_str << "failed to read off disk; see retval";