|
@@ -538,7 +538,7 @@ static struct lu_object *htable_lookup(struct lu_site *s,
|
|
__u64 ver = cfs_hash_bd_version_get(bd);
|
|
__u64 ver = cfs_hash_bd_version_get(bd);
|
|
|
|
|
|
if (*version == ver)
|
|
if (*version == ver)
|
|
- return NULL;
|
|
|
|
|
|
+ return ERR_PTR(-ENOENT);
|
|
|
|
|
|
*version = ver;
|
|
*version = ver;
|
|
bkt = cfs_hash_bd_extra_get(s->ls_obj_hash, bd);
|
|
bkt = cfs_hash_bd_extra_get(s->ls_obj_hash, bd);
|
|
@@ -547,7 +547,7 @@ static struct lu_object *htable_lookup(struct lu_site *s,
|
|
hnode = cfs_hash_bd_peek_locked(s->ls_obj_hash, bd, (void *)f);
|
|
hnode = cfs_hash_bd_peek_locked(s->ls_obj_hash, bd, (void *)f);
|
|
if (hnode == NULL) {
|
|
if (hnode == NULL) {
|
|
lprocfs_counter_incr(s->ls_stats, LU_SS_CACHE_MISS);
|
|
lprocfs_counter_incr(s->ls_stats, LU_SS_CACHE_MISS);
|
|
- return NULL;
|
|
|
|
|
|
+ return ERR_PTR(-ENOENT);
|
|
}
|
|
}
|
|
|
|
|
|
h = container_of0(hnode, struct lu_object_header, loh_hash);
|
|
h = container_of0(hnode, struct lu_object_header, loh_hash);
|
|
@@ -651,7 +651,7 @@ static struct lu_object *lu_object_find_try(const struct lu_env *env,
|
|
cfs_hash_bd_get_and_lock(hs, (void *)f, &bd, 1);
|
|
cfs_hash_bd_get_and_lock(hs, (void *)f, &bd, 1);
|
|
o = htable_lookup(s, &bd, f, waiter, &version);
|
|
o = htable_lookup(s, &bd, f, waiter, &version);
|
|
cfs_hash_bd_unlock(hs, &bd, 1);
|
|
cfs_hash_bd_unlock(hs, &bd, 1);
|
|
- if (o != NULL)
|
|
|
|
|
|
+ if (!IS_ERR(o) || PTR_ERR(o) != -ENOENT)
|
|
return o;
|
|
return o;
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -667,7 +667,7 @@ static struct lu_object *lu_object_find_try(const struct lu_env *env,
|
|
cfs_hash_bd_lock(hs, &bd, 1);
|
|
cfs_hash_bd_lock(hs, &bd, 1);
|
|
|
|
|
|
shadow = htable_lookup(s, &bd, f, waiter, &version);
|
|
shadow = htable_lookup(s, &bd, f, waiter, &version);
|
|
- if (likely(shadow == NULL)) {
|
|
|
|
|
|
+ if (likely(IS_ERR(shadow) && PTR_ERR(shadow) == -ENOENT)) {
|
|
struct lu_site_bkt_data *bkt;
|
|
struct lu_site_bkt_data *bkt;
|
|
|
|
|
|
bkt = cfs_hash_bd_extra_get(hs, &bd);
|
|
bkt = cfs_hash_bd_extra_get(hs, &bd);
|
|
@@ -2076,7 +2076,7 @@ void lu_object_assign_fid(const struct lu_env *env, struct lu_object *o,
|
|
cfs_hash_bd_get_and_lock(hs, (void *)fid, &bd, 1);
|
|
cfs_hash_bd_get_and_lock(hs, (void *)fid, &bd, 1);
|
|
shadow = htable_lookup(s, &bd, fid, &waiter, &version);
|
|
shadow = htable_lookup(s, &bd, fid, &waiter, &version);
|
|
/* supposed to be unique */
|
|
/* supposed to be unique */
|
|
- LASSERT(shadow == NULL);
|
|
|
|
|
|
+ LASSERT(IS_ERR(shadow) && PTR_ERR(shadow) == -ENOENT);
|
|
*old = *fid;
|
|
*old = *fid;
|
|
bkt = cfs_hash_bd_extra_get(hs, &bd);
|
|
bkt = cfs_hash_bd_extra_get(hs, &bd);
|
|
cfs_hash_bd_add_locked(hs, &bd, &o->lo_header->loh_hash);
|
|
cfs_hash_bd_add_locked(hs, &bd, &o->lo_header->loh_hash);
|