Reviewed-by: Greg Farnum <greg@xxxxxxxxxxx>
On Sun, Mar 17, 2013 at 7:51 AM, Yan, Zheng <zheng.z.yan@xxxxxxxxx> wrote:
> From: "Yan, Zheng" <zheng.z.yan@xxxxxxxxx>
>
> Signed-off-by: Yan, Zheng <zheng.z.yan@xxxxxxxxx>
> ---
> src/mds/Migrator.cc | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
> index 143d71e..963706c 100644
> --- a/src/mds/Migrator.cc
> +++ b/src/mds/Migrator.cc
> @@ -1658,11 +1658,14 @@ void Migrator::handle_export_cancel(MExportDirCancel *m)
> CInode *in = cache->get_inode(df.ino);
> assert(in);
> import_reverse_discovered(df, in);
> - } else if (import_state[df] == IMPORT_PREPPING ||
> - import_state[df] == IMPORT_PREPPED) {
> + } else if (import_state[df] == IMPORT_PREPPING) {
> CDir *dir = mds->mdcache->get_dirfrag(df);
> assert(dir);
> import_reverse_prepping(dir);
> + } else if (import_state[df] == IMPORT_PREPPED) {
> + CDir *dir = mds->mdcache->get_dirfrag(df);
> + assert(dir);
> + import_reverse_unfreeze(dir);
> } else {
> assert(0 == "got export_cancel in weird state");
> }
> --
> 1.7.11.7
>
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
