-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
/*
* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#define LMV_MAX_TGT_COUNT 128
-#define lmv_init_lock(lmv) cfs_down(&lmv->init_sem);
-#define lmv_init_unlock(lmv) cfs_up(&lmv->init_sem);
+#define lmv_init_lock(lmv) mutex_lock(&lmv->init_mutex);
+#define lmv_init_unlock(lmv) mutex_unlock(&lmv->init_mutex);
#define LL_IT2STR(it) \
((it) ? ldlm_it2str((it)->it_op) : "0")
/**
* Sema for protecting fields.
*/
- cfs_semaphore_t lo_guard;
+ struct mutex lo_guard;
/**
* Object state like O_FREEING.
*/
lmv_object_lock(struct lmv_object *obj)
{
LASSERT(obj);
- cfs_down(&obj->lo_guard);
+ mutex_lock(&obj->lo_guard);
}
static inline void
lmv_object_unlock(struct lmv_object *obj)
{
LASSERT(obj);
- cfs_up(&obj->lo_guard);
+ mutex_unlock(&obj->lo_guard);
}
void lmv_object_add(struct lmv_object *obj);
struct lmv_object *lmv_object_get(struct lmv_object *obj);
struct lmv_object *lmv_object_find(struct obd_device *obd,
- const struct lu_fid *fid);
+ const struct lu_fid *fid);
struct lmv_object *lmv_object_find_lock(struct obd_device *obd,
const struct lu_fid *fid);
void *lmm, int lmmsize, struct lookup_intent *it,
int flags, struct ptlrpc_request **reqp,
ldlm_blocking_callback cb_blocking,
- int extra_lock_flags);
+ __u64 extra_lock_flags);
int lmv_intent_lookup(struct obd_export *exp, struct md_op_data *op_data,
void *lmm, int lmmsize, struct lookup_intent *it,
int flags, struct ptlrpc_request **reqp,
ldlm_blocking_callback cb_blocking,
- int extra_lock_flags);
+ __u64 extra_lock_flags);
int lmv_intent_open(struct obd_export *exp, struct md_op_data *op_data,
void *lmm, int lmmsize, struct lookup_intent *it,
int flags, struct ptlrpc_request **reqp,
ldlm_blocking_callback cb_blocking,
- int extra_lock_flags);
+ __u64 extra_lock_flags);
int lmv_allocate_slaves(struct obd_device *obd, struct lu_fid *pid,
struct md_op_data *op, struct lu_fid *fid);
int lmv_revalidate_slaves(struct obd_export *, struct ptlrpc_request **,
const struct lu_fid *, struct lookup_intent *, int,
ldlm_blocking_callback cb_blocking,
- int extra_lock_flags);
+ __u64 extra_lock_flags);
int lmv_handle_split(struct obd_export *, const struct lu_fid *);
int lmv_blocking_ast(struct ldlm_lock *, struct ldlm_lock_desc *,
static inline struct lmv_tgt_desc *
lmv_find_target(struct lmv_obd *lmv, const struct lu_fid *fid)
{
- mdsno_t mds;
+ mdsno_t mds = 0;
int rc;
- rc = lmv_fld_lookup(lmv, fid, &mds);
- if (rc)
- return ERR_PTR(rc);
+ if (lmv->desc.ld_tgt_count > 1) {
+ rc = lmv_fld_lookup(lmv, fid, &mds);
+ if (rc)
+ return ERR_PTR(rc);
+ }
return lmv_get_target(lmv, mds);
}