X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_internal.h;h=8436d1fe95039ac9650006a3ed740a443e45e0fa;hp=e9dccbcd24ba364e5f86df2b8846f54f77a194d8;hb=342c14842fa996181e5d5764701585b1b2f6d6cb;hpb=df1d59429cbfd1ea2464e863458b6a4a268e516b diff --git a/lustre/osd-ldiskfs/osd_internal.h b/lustre/osd-ldiskfs/osd_internal.h index e9dccbc..8436d1f 100644 --- a/lustre/osd-ldiskfs/osd_internal.h +++ b/lustre/osd-ldiskfs/osd_internal.h @@ -261,13 +261,13 @@ struct osd_device { struct osd_obj_map *od_ost_map; struct osd_mdobj_map *od_mdt_map; - unsigned long long od_readcache_max_filesize; - int od_read_cache; - int od_writethrough_cache; + unsigned long long od_readcache_max_filesize; + int od_read_cache; + int od_writethrough_cache; - struct brw_stats od_brw_stats; - cfs_atomic_t od_r_in_flight; - cfs_atomic_t od_w_in_flight; + struct brw_stats od_brw_stats; + atomic_t od_r_in_flight; + atomic_t od_w_in_flight; struct mutex od_otable_mutex; struct osd_otable_it *od_otable_it; @@ -455,7 +455,7 @@ struct osd_it_quota { struct osd_iobuf { wait_queue_head_t dr_wait; - cfs_atomic_t dr_numreqs; /* number of reqs being processed */ + atomic_t dr_numreqs; /* number of reqs being processed */ int dr_max_pages; int dr_npages; int dr_error;