diff options
| author | Danny Al-Gaaf <danny.al-gaaf@bisect.de> | 2013-06-02 11:41:16 +0200 |
|---|---|---|
| committer | Danny Al-Gaaf <danny.al-gaaf@bisect.de> | 2013-06-03 11:55:50 +0200 |
| commit | 1b70fcd46c072aab9b03d4935b0dedc1d71711d8 (patch) | |
| tree | fb9d0b1162b7288a08d7e8e4f85f6289f31862ff /src/mds | |
| parent | 8afbc2805084aa945a6fd7a555b296f79eecc798 (diff) | |
| download | ceph-1b70fcd46c072aab9b03d4935b0dedc1d71711d8.tar.gz | |
mds/Migrator.cc: reduce scope of 'in' in handle_export_prep()
Reduce scope of 'CInode *in' since it's the way it's done already
in other paths of the function.
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Diffstat (limited to 'src/mds')
| -rw-r--r-- | src/mds/Migrator.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc index 59d7d8ebfb8..6ea28c9386a 100644 --- a/src/mds/Migrator.cc +++ b/src/mds/Migrator.cc @@ -1778,14 +1778,13 @@ void Migrator::handle_export_prep(MExportDirPrep *m) ::decode(start, q); dout(10) << " trace from " << df << " start " << start << " len " << p->length() << dendl; - CInode *in; CDir *cur = 0; if (start == 'd') { cur = cache->get_dirfrag(df); assert(cur); dout(10) << " had " << *cur << dendl; } else if (start == 'f') { - in = cache->get_inode(df.ino); + CInode *in = cache->get_inode(df.ino); assert(in); dout(10) << " had " << *in << dendl; cur = cache->add_replica_dir(q, in, oldauth, finished); @@ -1794,6 +1793,7 @@ void Migrator::handle_export_prep(MExportDirPrep *m) // nothing } else assert(0 == "unrecognized start char"); + while (start != '-') { CDentry *dn = cache->add_replica_dentry(q, cur, finished); dout(10) << " added " << *dn << dendl; |