* Author: Di Wang <di.wang@intel.com>
*/
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
#define DEBUG_SUBSYSTEM S_MDS
#include "osp_internal.h"
struct osp_device *d = (struct osp_device *) _d;
LASSERT(d);
- cfs_waitq_signal(&d->opd_pre_waitq);
+ wake_up(&d->opd_pre_waitq);
}
static int osp_statfs_interpret(const struct lu_env *env,
RETURN(0);
out:
/* couldn't update statfs, try again as soon as possible */
- cfs_waitq_signal(&d->opd_pre_waitq);
+ wake_up(&d->opd_pre_waitq);
if (req->rq_import_generation == imp->imp_generation)
CDEBUG(D_CACHE, "%s: couldn't update statfs: rc = %d\n",
d->opd_obd->obd_name, rc);
*/
d->opd_statfs_fresh_till = cfs_time_shift(-1);
cfs_timer_disarm(&d->opd_statfs_timer);
- cfs_waitq_signal(&d->opd_pre_waitq);
+ wake_up(&d->opd_pre_waitq);
}
}
osp_pre_update_status(d, -ENOSPC);
rc = -ENOSPC;
}
- cfs_waitq_signal(&d->opd_pre_waitq);
+ wake_up(&d->opd_pre_waitq);
GOTO(out_req, rc);
}
out_req:
/* now we can wakeup all users awaiting for objects */
osp_pre_update_status(d, rc);
- cfs_waitq_signal(&d->opd_pre_user_waitq);
+ wake_up(&d->opd_pre_user_waitq);
ptlrpc_req_finished(req);
RETURN(rc);
if (req == NULL)
RETURN(-ENOMEM);
- req_capsule_set_size(&req->rq_pill, &RMF_SETINFO_KEY, RCL_CLIENT,
+ req_capsule_set_size(&req->rq_pill, &RMF_GETINFO_KEY, RCL_CLIENT,
sizeof(KEY_LAST_FID));
- req_capsule_set_size(&req->rq_pill, &RMF_SETINFO_VAL, RCL_CLIENT,
- sizeof(struct lu_fid));
-
rc = ptlrpc_request_pack(req, LUSTRE_OST_VERSION, OST_GET_INFO);
if (rc) {
ptlrpc_request_free(req);
RETURN(rc);
}
- tmp = req_capsule_client_get(&req->rq_pill, &RMF_SETINFO_KEY);
+ tmp = req_capsule_client_get(&req->rq_pill, &RMF_GETINFO_KEY);
memcpy(tmp, KEY_LAST_FID, sizeof(KEY_LAST_FID));
req->rq_no_delay = req->rq_no_resend = 1;
- tmp = req_capsule_client_get(&req->rq_pill, &RMF_SETINFO_VAL);
- fid_cpu_to_le((struct lu_fid *)tmp, &d->opd_last_used_fid);
+ last_fid = req_capsule_client_get(&req->rq_pill, &RMF_FID);
+ fid_cpu_to_le(last_fid, &d->opd_last_used_fid);
+
ptlrpc_request_set_replen(req);
rc = ptlrpc_queue_wait(req);
if (req)
ptlrpc_req_finished(req);
+ spin_lock(&d->opd_pre_lock);
d->opd_pre_recovering = 0;
+ spin_unlock(&d->opd_pre_lock);
/*
* If rc is zero, the pre-creation window should have been emptied.
* this OSP isn't quite functional yet */
osp_pre_update_status(d, rc);
} else {
- cfs_waitq_signal(&d->opd_pre_user_waitq);
+ wake_up(&d->opd_pre_user_waitq);
}
}
d->opd_syn_changes, d->opd_syn_rpc_in_progress);
} else if (old == -ENOSPC) {
d->opd_pre_status = 0;
+ spin_lock(&d->opd_pre_lock);
d->opd_pre_grow_slow = 0;
d->opd_pre_grow_count = OST_MIN_PRECREATE;
- cfs_waitq_signal(&d->opd_pre_waitq);
+ spin_unlock(&d->opd_pre_lock);
+ wake_up(&d->opd_pre_waitq);
CDEBUG(D_INFO, "%s: no space: "LPU64" blocks, "LPU64
" free, "LPU64" used, "LPU64" avail -> %d: "
"rc = %d\n", d->opd_obd->obd_name,
}
out:
- cfs_waitq_signal(&d->opd_pre_user_waitq);
+ wake_up(&d->opd_pre_user_waitq);
}
static int osp_init_pre_fid(struct osp_device *osp)
struct osp_device *d = _arg;
struct ptlrpc_thread *thread = &d->opd_pre_thread;
struct l_wait_info lwi = { 0 };
- char pname[16];
struct lu_env env;
int rc;
ENTRY;
- sprintf(pname, "osp-pre-%u", d->opd_index);
- cfs_daemonize(pname);
-
rc = lu_env_init(&env, d->opd_dt_dev.dd_lu_dev.ld_type->ldt_ctx_tags);
if (rc) {
CERROR("%s: init env error: rc = %d\n", d->opd_obd->obd_name,
spin_lock(&d->opd_pre_lock);
thread->t_flags = SVC_RUNNING;
spin_unlock(&d->opd_pre_lock);
- cfs_waitq_signal(&thread->t_ctl_waitq);
+ wake_up(&thread->t_ctl_waitq);
while (osp_precreate_running(d)) {
/*
thread->t_flags = SVC_STOPPED;
lu_env_fini(&env);
- cfs_waitq_signal(&thread->t_ctl_waitq);
+ wake_up(&thread->t_ctl_waitq);
RETURN(0);
}
if (d->opd_pre_reserved + 1 < osp_objs_precreated(env, d))
return 1;
- /* ready if OST reported no space and no destoys in progress */
+ /* ready if OST reported no space and no destroys in progress */
if (d->opd_syn_changes + d->opd_syn_rpc_in_progress == 0 &&
d->opd_pre_status == -ENOSPC)
return 1;
+ /* Bail out I/O fails to OST */
+ if (d->opd_pre_status != 0 &&
+ d->opd_pre_status != -EAGAIN &&
+ d->opd_pre_status != -ENODEV &&
+ d->opd_pre_status != -ENOSPC) {
+ /* DEBUG LU-3230 */
+ if (d->opd_pre_status != -EIO)
+ CERROR("%s: precreate failed opd_pre_status %d\n",
+ d->opd_obd->obd_name, d->opd_pre_status);
+ return 1;
+ }
+
return 0;
}
/* XXX: don't wake up if precreation is in progress */
if (osp_precreate_near_empty_nolock(env, d) &&
!osp_precreate_end_seq_nolock(env, d))
- cfs_waitq_signal(&d->opd_pre_waitq);
+ wake_up(&d->opd_pre_waitq);
break;
}
}
/* XXX: don't wake up if precreation is in progress */
- cfs_waitq_signal(&d->opd_pre_waitq);
+ wake_up(&d->opd_pre_waitq);
lwi = LWI_TIMEOUT(expire - cfs_time_current(),
osp_precreate_timeout_condition, d);
* osp_precreate_thread() just before orphan cleanup
*/
if (unlikely(d->opd_pre_reserved == 0 && d->opd_pre_status))
- cfs_waitq_signal(&d->opd_pre_waitq);
+ wake_up(&d->opd_pre_waitq);
return 0;
}
body = req_capsule_client_get(&req->rq_pill, &RMF_OST_BODY);
LASSERT(body);
- lustre_set_wire_obdo(&body->oa, oa);
+ lustre_set_wire_obdo(&req->rq_import->imp_connect_data, &body->oa, oa);
/* XXX: capa support? */
/* osc_pack_capa(req, body, capa); */
int osp_init_precreate(struct osp_device *d)
{
struct l_wait_info lwi = { 0 };
- int rc;
+ struct task_struct *task;
ENTRY;
d->opd_pre_max_grow_count = OST_MAX_PRECREATE;
spin_lock_init(&d->opd_pre_lock);
- cfs_waitq_init(&d->opd_pre_waitq);
- cfs_waitq_init(&d->opd_pre_user_waitq);
- cfs_waitq_init(&d->opd_pre_thread.t_ctl_waitq);
+ init_waitqueue_head(&d->opd_pre_waitq);
+ init_waitqueue_head(&d->opd_pre_user_waitq);
+ init_waitqueue_head(&d->opd_pre_thread.t_ctl_waitq);
/*
* Initialize statfs-related things
/*
* start thread handling precreation and statfs updates
*/
- rc = cfs_create_thread(osp_precreate_thread, d, 0);
- if (rc < 0) {
- CERROR("can't start precreate thread %d\n", rc);
- RETURN(rc);
+ task = kthread_run(osp_precreate_thread, d,
+ "osp-pre-%u", d->opd_index);
+ if (IS_ERR(task)) {
+ CERROR("can't start precreate thread %ld\n", PTR_ERR(task));
+ RETURN(PTR_ERR(task));
}
l_wait_event(d->opd_pre_thread.t_ctl_waitq,
cfs_timer_disarm(&d->opd_statfs_timer);
thread->t_flags = SVC_STOPPING;
- cfs_waitq_signal(&d->opd_pre_waitq);
+ wake_up(&d->opd_pre_waitq);
- cfs_wait_event(thread->t_ctl_waitq, thread->t_flags & SVC_STOPPED);
+ wait_event(thread->t_ctl_waitq, thread->t_flags & SVC_STOPPED);
EXIT;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff