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-13723 lustre: Convert ERR_PTR(PTR_ERR()) to ERR_CAST()
[fs/lustre-release.git]
/
lustre
/
obdclass
/
llog_internal.h
diff --git
a/lustre/obdclass/llog_internal.h
b/lustre/obdclass/llog_internal.h
index
3c0107f
..
2642529
100644
(file)
--- a/
lustre/obdclass/llog_internal.h
+++ b/
lustre/obdclass/llog_internal.h
@@
-15,11
+15,7
@@
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
*
* GPL HEADER END
*/
@@
-27,7
+23,7
@@
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 201
5
, Intel Corporation.
+ * Copyright (c) 2012, 201
6
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-40,13
+36,14
@@
#include <lustre_log.h>
struct llog_process_info {
#include <lustre_log.h>
struct llog_process_info {
-
struct llog_handle
*lpi_loghandle;
-
llog_cb_t
lpi_cb;
-
void
*lpi_cbdata;
-
void
*lpi_catdata;
-
int
lpi_rc;
- struct completion lpi_completion;
+
struct llog_handle
*lpi_loghandle;
+
llog_cb_t
lpi_cb;
+
void
*lpi_cbdata;
+
void
*lpi_catdata;
+
int
lpi_rc;
+ struct completion
lpi_completion;
const struct lu_env *lpi_env;
const struct lu_env *lpi_env;
+ struct task_struct *lpi_reftask;
};
struct llog_thread_info {
};
struct llog_thread_info {
@@
-59,6
+56,7
@@
struct llog_thread_info {
struct dt_insert_rec lgi_dt_rec;
struct lu_seq_range lgi_range;
struct llog_cookie lgi_cookie;
struct dt_insert_rec lgi_dt_rec;
struct lu_seq_range lgi_range;
struct llog_cookie lgi_cookie;
+ struct obd_statfs lgi_statfs;
char lgi_name[32];
};
char lgi_name[32];
};
@@
-73,19
+71,11
@@
static inline struct llog_thread_info *llog_info(const struct lu_env *env)
return lgi;
}
return lgi;
}
-static inline void
-lustre_build_llog_lvfs_oid(struct llog_logid *logid, __u64 ino, __u32 gen)
-{
- ostid_set_seq_llog(&logid->lgl_oi);
- ostid_set_id(&logid->lgl_oi, ino);
- logid->lgl_ogen = gen;
-}
-
int llog_info_init(void);
void llog_info_fini(void);
int llog_info_init(void);
void llog_info_fini(void);
-
void
llog_handle_get(struct llog_handle *loghandle);
-
void llog_handle_put(
struct llog_handle *loghandle);
+
struct llog_handle *
llog_handle_get(struct llog_handle *loghandle);
+
int llog_handle_put(const struct lu_env *env,
struct llog_handle *loghandle);
int llog_cat_id2handle(const struct lu_env *env, struct llog_handle *cathandle,
struct llog_handle **res, struct llog_logid *logid);
int class_config_dump_handler(const struct lu_env *env,
int llog_cat_id2handle(const struct lu_env *env, struct llog_handle *cathandle,
struct llog_handle **res, struct llog_logid *logid);
int class_config_dump_handler(const struct lu_env *env,