X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flu_object.h;h=f431e0b4a5d2c3bc985f35c29c4e759def937c94;hb=e4872648bfaea1795133f10695c40e0fd3069831;hp=2498508959e3c63e2138975d2a32c63c1300df13;hpb=7c79b455bcc4e589aa07dba4430705545fbf41b5;p=fs%2Flustre-release.git diff --git a/lustre/include/lu_object.h b/lustre/include/lu_object.h index 2498508..f431e0b 100644 --- a/lustre/include/lu_object.h +++ b/lustre/include/lu_object.h @@ -30,6 +30,9 @@ * Use is subject to license terms. */ /* + * Copyright (c) 2011 Whamcloud, Inc. + */ +/* * This file is part of Lustre, http://www.lustre.org/ * Lustre is a trademark of Sun Microsystems, Inc. */ @@ -169,11 +172,23 @@ struct lu_device_operations { }; /** + * For lu_object_conf flags + */ +typedef enum { + /* Currently, only used for client-side object initialization. */ + LOC_F_NEW = 0x1, +} loc_flags_t; + +/** * Object configuration, describing particulars of object being created. On * server this is not used, as server objects are full identified by fid. On * client configuration contains struct lustre_md. */ struct lu_object_conf { + /** + * Some hints for obj find and alloc. + */ + loc_flags_t loc_flags; }; /** @@ -278,6 +293,10 @@ struct lu_device { * A list of references to this object, for debugging. */ struct lu_ref ld_reference; + /** + * Link the device to the site. + **/ + cfs_list_t ld_linkage; }; struct lu_device_type_operations; @@ -445,6 +464,8 @@ enum la_valid { LA_NLINK = 1 << 10, LA_RDEV = 1 << 11, LA_BLKSIZE = 1 << 12, + LA_KILL_SUID = 1 << 13, + LA_KILL_SGID = 1 << 14, }; /** @@ -551,6 +572,41 @@ struct lu_object_header { struct fld; +struct lu_site_bkt_data { + /** + * number of busy object on this bucket + */ + long lsb_busy; + /** + * LRU list, updated on each access to object. Protected by + * bucket lock of lu_site::ls_obj_hash. + * + * "Cold" end of LRU is lu_site::ls_lru.next. Accessed object are + * moved to the lu_site::ls_lru.prev (this is due to the non-existence + * of list_for_each_entry_safe_reverse()). + */ + cfs_list_t lsb_lru; + /** + * Wait-queue signaled when an object in this site is ultimately + * destroyed (lu_object_free()). It is used by lu_object_find() to + * wait before re-trying when object in the process of destruction is + * found in the hash table. + * + * \see htable_lookup(). + */ + cfs_waitq_t lsb_marche_funebre; +}; + +enum { + LU_SS_CREATED = 0, + LU_SS_CACHE_HIT, + LU_SS_CACHE_MISS, + LU_SS_CACHE_RACE, + LU_SS_CACHE_DEATH_RACE, + LU_SS_LRU_PURGED, + LU_SS_LAST_STAT +}; + /** * lu_site is a "compartment" within which objects are unique, and LRU * discipline is maintained. @@ -563,107 +619,44 @@ struct fld; */ struct lu_site { /** - * Site-wide lock. - * - * lock protecting: - * - * - lu_site::ls_hash hash table (and its linkages in objects); - * - * - lu_site::ls_lru list (and its linkages in objects); - * - * - 0/1 transitions of object lu_object_header::loh_ref - * reference count; - * - * yes, it's heavy. + * objects hash table */ - cfs_rwlock_t ls_guard; + cfs_hash_t *ls_obj_hash; /** - * Hash-table where objects are indexed by fid. + * index of bucket on hash table while purging */ - cfs_hlist_head_t *ls_hash; - /** - * Bit-mask for hash-table size. - */ - int ls_hash_mask; - /** - * Order of hash-table. - */ - int ls_hash_bits; - /** - * Number of buckets in the hash-table. - */ - int ls_hash_size; - - /** - * LRU list, updated on each access to object. Protected by - * lu_site::ls_guard. - * - * "Cold" end of LRU is lu_site::ls_lru.next. Accessed object are - * moved to the lu_site::ls_lru.prev (this is due to the non-existence - * of list_for_each_entry_safe_reverse()). - */ - cfs_list_t ls_lru; - /** - * Total number of objects in this site. Protected by - * lu_site::ls_guard. - */ - unsigned ls_total; - /** - * Total number of objects in this site with reference counter greater - * than 0. Protected by lu_site::ls_guard. - */ - unsigned ls_busy; - + int ls_purge_start; /** * Top-level device for this stack. */ struct lu_device *ls_top_dev; - /** - * Wait-queue signaled when an object in this site is ultimately - * destroyed (lu_object_free()). It is used by lu_object_find() to - * wait before re-trying when object in the process of destruction is - * found in the hash table. - * - * If having a single wait-queue turns out to be a problem, a - * wait-queue per hash-table bucket can be easily implemented. - * - * \see htable_lookup(). + * Linkage into global list of sites. */ - cfs_waitq_t ls_marche_funebre; - - /** statistical counters. Protected by nothing, races are accepted. */ - struct { - __u32 s_created; - __u32 s_cache_hit; - __u32 s_cache_miss; - /** - * Number of hash-table entry checks made. - * - * ->s_cache_check / (->s_cache_miss + ->s_cache_hit) - * - * is an average number of hash slots inspected during single - * lookup. - */ - __u32 s_cache_check; - /** Races with cache insertions. */ - __u32 s_cache_race; - /** - * Races with object destruction. - * - * \see lu_site::ls_marche_funebre. - */ - __u32 s_cache_death_race; - __u32 s_lru_purged; - } ls_stats; + cfs_list_t ls_linkage; + /** + * List for lu device for this site, protected + * by ls_ld_lock. + **/ + cfs_list_t ls_ld_linkage; + cfs_spinlock_t ls_ld_lock; /** - * Linkage into global list of sites. + * lu_site stats */ - cfs_list_t ls_linkage; + struct lprocfs_stats *ls_stats; struct lprocfs_stats *ls_time_stats; }; +static inline struct lu_site_bkt_data * +lu_site_bkt_from_fid(struct lu_site *site, struct lu_fid *fid) +{ + cfs_hash_bd_t bd; + + cfs_hash_bd_get(site->ls_obj_hash, fid, &bd); + return cfs_hash_bd_extra_get(site->ls_obj_hash, &bd); +} + /** \name ctors * Constructors/destructors. * @{ @@ -850,6 +843,7 @@ int lu_object_invariant(const struct lu_object *o); /** * \retval 1 iff object \a o exists on stable storage, + * \retval 0 iff object \a o not exists on stable storage. * \retval -1 iff object \a o is on remote server. */ static inline int lu_object_exists(const struct lu_object *o) @@ -1294,7 +1288,6 @@ struct lu_name { struct lu_buf { void *lb_buf; ssize_t lb_len; - int lb_vmalloc:1; }; /** null buffer */