LU-2275 mdt: Avoid setting positive dispositions too early

[fs/lustre-release.git] / lustre / mdt / mdt_capa.c

diff --git a/lustre/mdt/mdt_capa.c b/lustre/mdt/mdt_capa.c
index 968121d..b86b865 100644 (file)
--- a/lustre/mdt/mdt_capa.c
+++ b/lustre/mdt/mdt_capa.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,10 +26,8 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
- * Copyright (c) 2011 Whamcloud, Inc.
- */
-/*
- * Copyright (c) 2011 Whamcloud, Inc.
+ *
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -44,9 +40,6 @@
  * Author: Lai Siyao <lsy@clusterfs.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_MDS
 
 #include "mdt_internal.h"
@@ -93,16 +86,16 @@ static int write_capa_keys(const struct lu_env *env,
         int i, rc;
 
         mti = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
-        th = mdt_trans_create(env, mdt);
-        if (IS_ERR(th))
-                RETURN(PTR_ERR(th));
+       th = dt_trans_create(env, mdt->mdt_bottom);
+       if (IS_ERR(th))
+               RETURN(PTR_ERR(th));
 
-        rc = dt_declare_record_write(env, mdt->mdt_ck_obj,
-                                     sizeof(*tmp) * 3, 0, th);
-        if (rc)
-                goto stop;
+       rc = dt_declare_record_write(env, mdt->mdt_ck_obj,
+                                    sizeof(*tmp) * 3, 0, th);
+       if (rc)
+               goto stop;
 
-        rc = mdt_trans_start(env, mdt, th);
+       rc = dt_trans_start_local(env, mdt->mdt_bottom, th);
         if (rc)
                 goto stop;
 
@@ -119,7 +112,7 @@ static int write_capa_keys(const struct lu_env *env,
         }
 
 stop:
-        mdt_trans_stop(env, mdt, th);
+       dt_trans_stop(env, mdt->mdt_bottom, th);
 
         CDEBUG(D_INFO, "write capability keys rc = %d:\n", rc);
         return rc;
@@ -263,17 +256,17 @@ static int mdt_ck_thread_main(void *args)
                 next = mdt->mdt_child;
                 rc = next->md_ops->mdo_update_capa_key(&env, next, tmp);
                 if (!rc) {
-                        cfs_spin_lock(&capa_lock);
-                        *bkey = *rkey;
-                        *rkey = *tmp;
-                        cfs_spin_unlock(&capa_lock);
-
-                        rc = write_capa_keys(&env, mdt, mdt->mdt_capa_keys);
-                        if (rc) {
-                                cfs_spin_lock(&capa_lock);
-                                *rkey = *bkey;
-                                memset(bkey, 0, sizeof(*bkey));
-                                cfs_spin_unlock(&capa_lock);
+                       spin_lock(&capa_lock);
+                       *bkey = *rkey;
+                       *rkey = *tmp;
+                       spin_unlock(&capa_lock);
+
+                       rc = write_capa_keys(&env, mdt, mdt->mdt_capa_keys);
+                       if (rc) {
+                               spin_lock(&capa_lock);
+                               *rkey = *bkey;
+                               memset(bkey, 0, sizeof(*bkey));
+                               spin_unlock(&capa_lock);
                         } else {
                                 set_capa_key_expiry(mdt);
                                 DEBUG_CAPA_KEY(D_SEC, rkey, "new");