X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_io.c;h=15977013b47c59b76799e89816e13fac69468d87;hb=9f82e9216a1d80bac7ded5cfc1a711c379a30f29;hp=3cc3c629755109f0efa784215df958d80446a0d0;hpb=c1baab294d7efb10a2e81cefc12dbc8103c8f175;p=fs%2Flustre-release.git

diff --git a/lustre/osd-zfs/osd_io.c b/lustre/osd-zfs/osd_io.c
index 3cc3c62..1597701 100644
--- a/lustre/osd-zfs/osd_io.c
+++ b/lustre/osd-zfs/osd_io.c
@@ -28,7 +28,7 @@
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2011, 2012 Whamcloud, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  * Use is subject to license terms.
  */
 /*
@@ -86,9 +86,9 @@ static ssize_t osd_read(const struct lu_env *env, struct dt_object *dt,
 	LASSERT(dt_object_exists(dt));
 	LASSERT(obj->oo_db);
 
-	cfs_read_lock(&obj->oo_attr_lock);
+	read_lock(&obj->oo_attr_lock);
 	old_size = obj->oo_attr.la_size;
-	cfs_read_unlock(&obj->oo_attr_lock);
+	read_unlock(&obj->oo_attr_lock);
 
 	if (*pos + size > old_size) {
 		if (old_size < *pos)
@@ -172,10 +172,10 @@ static ssize_t osd_write(const struct lu_env *env, struct dt_object *dt,
 
 	dmu_write(osd->od_objset.os, obj->oo_db->db_object, offset,
 		(uint64_t)buf->lb_len, buf->lb_buf, oh->ot_tx);
-	cfs_write_lock(&obj->oo_attr_lock);
+	write_lock(&obj->oo_attr_lock);
 	if (obj->oo_attr.la_size < offset + buf->lb_len) {
 		obj->oo_attr.la_size = offset + buf->lb_len;
-		cfs_write_unlock(&obj->oo_attr_lock);
+		write_unlock(&obj->oo_attr_lock);
 		/* osd_object_sa_update() will be copying directly from oo_attr
 		 * into dbuf.  any update within a single txg will copy the
 		 * most actual */
@@ -184,7 +184,7 @@ static ssize_t osd_write(const struct lu_env *env, struct dt_object *dt,
 		if (unlikely(rc))
 			GOTO(out, rc);
 	} else {
-		cfs_write_unlock(&obj->oo_attr_lock);
+		write_unlock(&obj->oo_attr_lock);
 	}
 
 	*pos += buf->lb_len;
@@ -297,7 +297,7 @@ static int osd_bufs_get_read(const struct lu_env *env, struct osd_object *obj,
 
 				lnb->rc = 0;
 				lnb->lnb_file_offset = off;
-				lnb->offset = bufoff & ~CFS_PAGE_MASK;
+				lnb->lnb_page_offset = bufoff & ~CFS_PAGE_MASK;
 				lnb->len = thispage;
 				lnb->page = kmem_to_page(dbp[i]->db_data +
 								bufoff);
@@ -363,7 +363,7 @@ static int osd_bufs_get_write(const struct lu_env *env, struct osd_object *obj,
 				plen = min_t(int, sz_in_block, CFS_PAGE_SIZE);
 
 				lnb[i].lnb_file_offset = off;
-				lnb[i].offset = 0;
+				lnb[i].lnb_page_offset = 0;
 				lnb[i].len = plen;
 				lnb[i].rc = 0;
 				if (sz_in_block == bs)
@@ -397,7 +397,7 @@ static int osd_bufs_get_write(const struct lu_env *env, struct osd_object *obj,
 				plen = min_t(int, sz_in_block, CFS_PAGE_SIZE);
 
 				lnb[i].lnb_file_offset = off;
-				lnb[i].offset = 0;
+				lnb[i].lnb_page_offset = 0;
 				lnb[i].len = plen;
 				lnb[i].rc = 0;
 				lnb[i].dentry = NULL;
@@ -692,17 +692,17 @@ static int osd_write_commit(const struct lu_env *env, struct dt_object *dt,
 		RETURN(0);
 	}
 
-	cfs_write_lock(&obj->oo_attr_lock);
+	write_lock(&obj->oo_attr_lock);
 	if (obj->oo_attr.la_size < new_size) {
 		obj->oo_attr.la_size = new_size;
-		cfs_write_unlock(&obj->oo_attr_lock);
+		write_unlock(&obj->oo_attr_lock);
 		/* osd_object_sa_update() will be copying directly from
 		 * oo_attr into dbuf. any update within a single txg will copy
 		 * the most actual */
 		rc = osd_object_sa_update(obj, SA_ZPL_SIZE(uos),
 					&obj->oo_attr.la_size, 8, oh);
 	} else {
-		cfs_write_unlock(&obj->oo_attr_lock);
+		write_unlock(&obj->oo_attr_lock);
 	}
 
 	RETURN(rc);
@@ -793,21 +793,21 @@ static int osd_punch(const struct lu_env *env, struct dt_object *dt,
 	LASSERT(th != NULL);
 	oh = container_of0(th, struct osd_thandle, ot_super);
 
-	cfs_write_lock(&obj->oo_attr_lock);
+	write_lock(&obj->oo_attr_lock);
 	/* truncate */
 	if (end == OBD_OBJECT_EOF || end >= obj->oo_attr.la_size)
 		len = DMU_OBJECT_END;
 	else
 		len = end - start;
-	cfs_write_unlock(&obj->oo_attr_lock);
+	write_unlock(&obj->oo_attr_lock);
 
 	rc = __osd_object_punch(osd->od_objset.os, obj->oo_db, oh->ot_tx,
 				obj->oo_attr.la_size, start, len);
 	/* set new size */
 	if (len == DMU_OBJECT_END) {
-		cfs_write_lock(&obj->oo_attr_lock);
+		write_lock(&obj->oo_attr_lock);
 		obj->oo_attr.la_size = start;
-		cfs_write_unlock(&obj->oo_attr_lock);
+		write_unlock(&obj->oo_attr_lock);
 		rc = osd_object_sa_update(obj, SA_ZPL_SIZE(uos),
 					&obj->oo_attr.la_size, 8, oh);
 	}
@@ -825,7 +825,7 @@ static int osd_declare_punch(const struct lu_env *env, struct dt_object *dt,
 
 	oh = container_of0(handle, struct osd_thandle, ot_super);
 
-	cfs_read_lock(&obj->oo_attr_lock);
+	read_lock(&obj->oo_attr_lock);
 	if (end == OBD_OBJECT_EOF || end >= obj->oo_attr.la_size)
 		len = DMU_OBJECT_END;
 	else
@@ -833,10 +833,10 @@ static int osd_declare_punch(const struct lu_env *env, struct dt_object *dt,
 
 	/* declare we'll free some blocks ... */
 	if (start < obj->oo_attr.la_size) {
-		cfs_read_unlock(&obj->oo_attr_lock);
+		read_unlock(&obj->oo_attr_lock);
 		dmu_tx_hold_free(oh->ot_tx, obj->oo_db->db_object, start, len);
 	} else {
-		cfs_read_unlock(&obj->oo_attr_lock);
+		read_unlock(&obj->oo_attr_lock);
 	}
 
 	/* ... and we'll modify size attribute */