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-6968 llog: Only update necessary part of header
[fs/lustre-release.git]
/
lustre
/
osp
/
osp_sync.c
diff --git
a/lustre/osp/osp_sync.c
b/lustre/osp/osp_sync.c
index
2f9b78a
..
f0d785a
100644
(file)
--- a/
lustre/osp/osp_sync.c
+++ b/
lustre/osp/osp_sync.c
@@
-43,6
+43,7
@@
#define DEBUG_SUBSYSTEM S_MDS
#define DEBUG_SUBSYSTEM S_MDS
+#include <linux/kthread.h>
#include <lustre_log.h>
#include <lustre_update.h>
#include "osp_internal.h"
#include <lustre_log.h>
#include <lustre_update.h>
#include "osp_internal.h"
@@
-447,7
+448,7
@@
static void osp_sync_request_commit_cb(struct ptlrpc_request *req)
* The callback is called by ptlrpc when RPC is replied. Now we have to decide
* whether we should:
* - put request on a special list to wait until it's committed by the target,
* The callback is called by ptlrpc when RPC is replied. Now we have to decide
* whether we should:
* - put request on a special list to wait until it's committed by the target,
- * if the request is succesful
+ * if the request is succes
s
ful
* - schedule llog record cancel if no target object is found
* - try later (essentially after reboot) in case of unexpected error
*
* - schedule llog record cancel if no target object is found
* - try later (essentially after reboot) in case of unexpected error
*
@@
-555,7
+556,7
@@
static void osp_sync_send_new_rpc(struct osp_device *d,
jra->jra_magic = OSP_JOB_MAGIC;
INIT_LIST_HEAD(&jra->jra_link);
jra->jra_magic = OSP_JOB_MAGIC;
INIT_LIST_HEAD(&jra->jra_link);
- ptlrpcd_add_req(req
, PDL_POLICY_ROUND, -1
);
+ ptlrpcd_add_req(req);
}
}
@@
-1232,7
+1233,8
@@
static int osp_sync_llog_init(const struct lu_env *env, struct osp_device *d)
POSTID(&osi->osi_cid.lci_logid.lgl_oi),
osi->osi_cid.lci_logid.lgl_ogen);
POSTID(&osi->osi_cid.lci_logid.lgl_oi),
osi->osi_cid.lci_logid.lgl_ogen);
- rc = llog_setup(env, obd, &obd->obd_olg, LLOG_MDS_OST_ORIG_CTXT, obd,
+ rc = llog_setup(env, obd, &obd->obd_olg, LLOG_MDS_OST_ORIG_CTXT,
+ d->opd_storage->dd_lu_dev.ld_obd,
&osp_mds_ost_orig_logops);
if (rc)
RETURN(rc);
&osp_mds_ost_orig_logops);
if (rc)
RETURN(rc);