X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd%2Fosd_oi.c;h=a0ac44c60b6b669ada0a0c80472f4958e96c20a7;hb=6e3ec5812ebd1b5ecf7cae584f429b013ffe7431;hp=a66a0349ebb5a0da2c3c958c2eb5e9b76948dbf0;hpb=fbfd488a2f87ea43332ae16341887f68c0ffbde5;p=fs%2Flustre-release.git diff --git a/lustre/osd/osd_oi.c b/lustre/osd/osd_oi.c index a66a034..a0ac44c 100644 --- a/lustre/osd/osd_oi.c +++ b/lustre/osd/osd_oi.c @@ -81,7 +81,7 @@ struct oi_descr { }; /** to serialize concurrent OI index initialization */ -static struct mutex oi_init_lock; +static cfs_mutex_t oi_init_lock; static struct dt_index_features oi_feat = { .dif_flags = DT_IND_UPDATE, @@ -139,7 +139,7 @@ int osd_oi_init(struct osd_thread_info *info, int i; env = info->oti_env; - mutex_lock(&oi_init_lock); + cfs_mutex_lock(&oi_init_lock); memset(oi, 0, sizeof *oi); retry: for (i = rc = 0; i < OSD_OI_FID_NR && rc == 0; ++i) { @@ -173,7 +173,7 @@ retry: if (rc != 0) osd_oi_fini(info, oi); - mutex_unlock(&oi_init_lock); + cfs_mutex_unlock(&oi_init_lock); return rc; } @@ -274,6 +274,6 @@ int osd_oi_delete(struct osd_thread_info *info, int osd_oi_mod_init() { - mutex_init(&oi_init_lock); + cfs_mutex_init(&oi_init_lock); return 0; }