X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Flcommon_cl.c;h=84ff1ee27148a49acbea2604822404a60aceecf8;hb=0f22e4c098b1f7885ef509bbfc346b3e8905b28d;hp=149d83d2ef32cd7f99337535761c038d4a53acc9;hpb=3120c92d0581d884d29f428dbf8eb9d7dfab97b0;p=fs%2Flustre-release.git

diff --git a/lustre/llite/lcommon_cl.c b/lustre/llite/lcommon_cl.c
index 149d83d2..84ff1ee 100644
--- a/lustre/llite/lcommon_cl.c
+++ b/lustre/llite/lcommon_cl.c
@@ -53,7 +53,6 @@
 #include <obd.h>
 #include <obd_support.h>
 #include <lustre_fid.h>
-#include <lustre_lite.h>
 #include <lustre_dlm.h>
 #include <lustre_ver.h>
 #include <lustre_mdc.h>
@@ -348,13 +347,13 @@ struct lu_object *ccc_object_alloc(const struct lu_env *env,
 }
 
 int ccc_object_init0(const struct lu_env *env,
-                            struct ccc_object *vob,
-                            const struct cl_object_conf *conf)
+		     struct ccc_object *vob,
+		     const struct cl_object_conf *conf)
 {
-        vob->cob_inode = conf->coc_inode;
-        vob->cob_transient_pages = 0;
+	vob->cob_inode = conf->coc_inode;
+	atomic_set(&vob->cob_transient_pages, 0);
 	cl_object_page_init(&vob->cob_cl, sizeof(struct ccc_page));
-        return 0;
+	return 0;
 }
 
 int ccc_object_init(const struct lu_env *env, struct lu_object *obj,
@@ -946,7 +945,7 @@ void ccc_req_attr_set(const struct lu_env *env,
 	if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_INVALID_PFID))
 		oa->o_parent_oid++;
 	memcpy(attr->cra_jobid, cl_i2info(inode)->lli_jobid,
-	       JOBSTATS_JOBID_SIZE);
+	       LUSTRE_JOBID_SIZE);
 }
 
 static const struct cl_req_operations ccc_req_ops = {