X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_trans.c;h=b5b32f6ae64e76861969a04588059e12e9eb7751;hb=refs%2Fchanges%2F78%2F16778%2F4;hp=f5258c5aa19bfc33a806c03052b1ca9557f0dfa1;hpb=e2af7fb3c91dfb13d34d8e1b2f2df8c09621f768;p=fs%2Flustre-release.git diff --git a/lustre/mdd/mdd_trans.c b/lustre/mdd/mdd_trans.c index f5258c5..b5b32f6 100644 --- a/lustre/mdd/mdd_trans.c +++ b/lustre/mdd/mdd_trans.c @@ -27,7 +27,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2012, Whamcloud, Inc. + * Copyright (c) 2011, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -42,38 +42,12 @@ #define DEBUG_SUBSYSTEM S_MDS -#include -#ifdef HAVE_EXT4_LDISKFS -#include -#else -#include -#endif -#include #include -#include -#include #include - -#ifdef HAVE_EXT4_LDISKFS -#include -#else -#include -#endif #include -#include #include "mdd_internal.h" -int mdd_txn_stop_cb(const struct lu_env *env, struct thandle *txn, - void *cookie) -{ - struct mdd_device *mdd = cookie; - struct obd_device *obd = mdd2obd_dev(mdd); - - LASSERT(obd); - return mds_lov_write_objids(obd); -} - struct thandle *mdd_trans_create(const struct lu_env *env, struct mdd_device *mdd) { @@ -86,9 +60,9 @@ int mdd_trans_start(const struct lu_env *env, struct mdd_device *mdd, return mdd_child_ops(mdd)->dt_trans_start(env, mdd->mdd_child, th); } -void mdd_trans_stop(const struct lu_env *env, struct mdd_device *mdd, - int result, struct thandle *handle) +int mdd_trans_stop(const struct lu_env *env, struct mdd_device *mdd, + int result, struct thandle *handle) { - handle->th_result = result; - mdd_child_ops(mdd)->dt_trans_stop(env, handle); + handle->th_result = result; + return mdd_child_ops(mdd)->dt_trans_stop(env, mdd->mdd_child, handle); }