Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-3490 kerberos: Enable GSSAPI support by default
[fs/lustre-release.git]
/
lustre
/
fid
/
fid_store.c
diff --git
a/lustre/fid/fid_store.c
b/lustre/fid/fid_store.c
index
13a0933
..
5ae8307
100644
(file)
--- a/
lustre/fid/fid_store.c
+++ b/
lustre/fid/fid_store.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) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 201
2, Whamcloud, Inc
.
+ * Copyright (c) 2011, 201
3, Intel Corporation
.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-42,24
+42,15
@@
#define DEBUG_SUBSYSTEM S_FID
#define DEBUG_SUBSYSTEM S_FID
-#ifdef __KERNEL__
-# include <libcfs/libcfs.h>
-# include <linux/module.h>
-#else /* __KERNEL__ */
-# include <liblustre.h>
-#endif
-
-#include <obd.h>
-#include <obd_class.h>
+#include <libcfs/libcfs.h>
#include <dt_object.h>
#include <md_object.h>
#include <obd_support.h>
#include <dt_object.h>
#include <md_object.h>
#include <obd_support.h>
-#include <lustre_
req_layout
.h>
+#include <lustre_
capa
.h>
#include <lustre_fid.h>
#include <lustre_fid.h>
+#include <lustre_fld.h>
#include "fid_internal.h"
#include "fid_internal.h"
-#ifdef __KERNEL__
-
static struct lu_buf *seq_store_buf(struct seq_thread_info *info)
{
struct lu_buf *buf;
static struct lu_buf *seq_store_buf(struct seq_thread_info *info)
{
struct lu_buf *buf;
@@
-137,7
+128,7
@@
int seq_store_update(const struct lu_env *env, struct lu_server_seq *seq,
if (out != NULL) {
rc = fld_declare_server_create(env,
if (out != NULL) {
rc = fld_declare_server_create(env,
- seq->lss_site->
m
s_server_fld,
+ seq->lss_site->
s
s_server_fld,
out, th);
if (rc)
GOTO(exit, rc);
out, th);
if (rc)
GOTO(exit, rc);
@@
-156,7
+147,7
@@
int seq_store_update(const struct lu_env *env, struct lu_server_seq *seq,
seq->lss_name, rc);
GOTO(exit, rc);
} else if (out != NULL) {
seq->lss_name, rc);
GOTO(exit, rc);
} else if (out != NULL) {
- rc = fld_server_create(env, seq->lss_site->
m
s_server_fld, out,
+ rc = fld_server_create(env, seq->lss_site->
s
s_server_fld, out,
th);
if (rc) {
CERROR("%s: Can't Update fld database, rc %d\n",
th);
if (rc) {
CERROR("%s: Can't Update fld database, rc %d\n",
@@
-262,4
+253,3
@@
void seq_store_fini(struct lu_server_seq *seq,
EXIT;
}
EXIT;
}
-#endif