LU-6105 build: Update SPL/ZFS version to 0.6.3-1.2

[fs/lustre-release.git] / lustre / fid / fid_handler.c

diff --git a/lustre/fid/fid_handler.c b/lustre/fid/fid_handler.c
index 95b25b9..d337ff1 100644 (file)
--- a/lustre/fid/fid_handler.c
+++ b/lustre/fid/fid_handler.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, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -47,7 +47,6 @@
 #include <obd.h>
 #include <obd_class.h>
 #include <dt_object.h>
-#include <md_object.h>
 #include <obd_support.h>
 #include <lustre_req_layout.h>
 #include <lustre_fid.h>
@@ -68,12 +67,11 @@ int seq_server_set_cli(const struct lu_env *env, struct lu_server_seq *seq,
          */
        mutex_lock(&seq->lss_mutex);
 
-        if (cli == NULL) {
-                CDEBUG(D_INFO, "%s: Detached sequence client %s\n",
-                       seq->lss_name, cli->lcs_name);
-                seq->lss_cli = cli;
-                GOTO(out_up, rc = 0);
-        }
+       if (cli == NULL) {
+               CDEBUG(D_INFO, "%s: Detached sequence client\n", seq->lss_name);
+               seq->lss_cli = NULL;
+               GOTO(out_up, rc = 0);
+       }
 
        if (seq->lss_cli != NULL) {
                CDEBUG(D_HA, "%s: Sequence controller is already "
@@ -413,25 +411,24 @@ extern const struct file_operations seq_fld_proc_seq_fops;
 static int seq_server_proc_init(struct lu_server_seq *seq)
 {
 #ifdef LPROCFS
+       int rc;
+       ENTRY;
 
-        int rc;
-        ENTRY;
-
-        seq->lss_proc_dir = lprocfs_register(seq->lss_name,
-                                             seq_type_proc_dir,
-                                             NULL, NULL);
-        if (IS_ERR(seq->lss_proc_dir)) {
-                rc = PTR_ERR(seq->lss_proc_dir);
-                RETURN(rc);
-        }
+       seq->lss_proc_dir = lprocfs_seq_register(seq->lss_name,
+                                                seq_type_proc_dir,
+                                                NULL, NULL);
+       if (IS_ERR(seq->lss_proc_dir)) {
+               rc = PTR_ERR(seq->lss_proc_dir);
+               RETURN(rc);
+       }
 
-        rc = lprocfs_add_vars(seq->lss_proc_dir,
-                              seq_server_proc_list, seq);
-        if (rc) {
-                CERROR("%s: Can't init sequence manager "
-                       "proc, rc %d\n", seq->lss_name, rc);
-                GOTO(out_cleanup, rc);
-        }
+       rc = lprocfs_seq_add_vars(seq->lss_proc_dir,
+                                 seq_server_proc_list, seq);
+       if (rc) {
+               CERROR("%s: Can't init sequence manager "
+                      "proc, rc %d\n", seq->lss_name, rc);
+               GOTO(out_cleanup, rc);
+       }
 
        if (seq->lss_type == LUSTRE_SEQ_CONTROLLER) {
                rc = lprocfs_seq_create(seq->lss_proc_dir, "fldb", 0644,
@@ -443,11 +440,11 @@ static int seq_server_proc_init(struct lu_server_seq *seq)
                }
        }
 
-        RETURN(0);
+       RETURN(0);
 
 out_cleanup:
-        seq_server_proc_fini(seq);
-        return rc;
+       seq_server_proc_fini(seq);
+       return rc;
 #else /* LPROCFS */
        return 0;
 #endif