* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * 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) down(&lmv->init_sem);
-#define lmv_init_unlock(lmv) up(&lmv->init_sem);
+#define lmv_init_lock(lmv) cfs_mutex_lock(&lmv->init_mutex);
+#define lmv_init_unlock(lmv) cfs_mutex_unlock(&lmv->init_mutex);
#define LL_IT2STR(it) \
((it) ? ldlm_it2str((it)->it_op) : "0")
struct lmv_stripe {
- /**
- * Dir stripe fid.
+ /**
+ * Dir stripe fid.
*/
struct lu_fid ls_fid;
- /**
- * Cached home mds number for @li_fid.
+ /**
+ * Cached home mds number for \a li_fid.
*/
mdsno_t ls_mds;
- /**
+ /**
* Stripe object size.
*/
unsigned long ls_size;
/**
* Link to global objects list.
*/
- struct list_head lo_list;
+ cfs_list_t lo_list;
/**
* Sema for protecting fields.
*/
- struct semaphore lo_guard;
- /**
+ cfs_mutex_t lo_guard;
+ /**
* Object state like O_FREEING.
*/
int lo_state;
- /**
- * Object ref counter.
+ /**
+ * Object ref counter.
*/
- atomic_t lo_count;
- /**
+ cfs_atomic_t lo_count;
+ /**
* Object master fid.
*/
struct lu_fid lo_fid;
* Object hash type to find stripe by name.
*/
__u32 lo_hashtype;
- /**
- * Number of stripes.
+ /**
+ * Number of stripes.
*/
int lo_objcount;
- /**
- * Array of sub-objs.
+ /**
+ * Array of sub-objs.
*/
struct lmv_stripe *lo_stripes;
- /**
+ /**
* Pointer to LMV obd.
*/
struct obd_device *lo_obd;
lmv_object_lock(struct lmv_object *obj)
{
LASSERT(obj);
- down(&obj->lo_guard);
+ cfs_mutex_lock(&obj->lo_guard);
}
static inline void
lmv_object_unlock(struct lmv_object *obj)
{
LASSERT(obj);
- up(&obj->lo_guard);
+ cfs_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);
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);
}