X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fllite_mmap.c;h=6836802f976b0e76515fccb27f79d9e2ce46cdc7;hb=bb6dbca9c2c9bdcd33663d6449b27a671fcaf902;hp=7ead9985998867228367b9f262df226d87904b01;hpb=719757dd2526e003911eed0b0830ed70d278cdd4;p=fs%2Flustre-release.git

diff --git a/lustre/llite/llite_mmap.c b/lustre/llite/llite_mmap.c
index 7ead998..6836802 100644
--- a/lustre/llite/llite_mmap.c
+++ b/lustre/llite/llite_mmap.c
@@ -151,7 +151,7 @@ ll_fault_io_init(struct vm_area_struct *vma, struct lu_env **env_ret,
 
 	rc = cl_io_init(env, io, CIT_FAULT, io->ci_obj);
 	if (rc == 0) {
-		struct ccc_io *cio = ccc_env_io(env);
+		struct vvp_io *cio = vvp_env_io(env);
 		struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
 
 		LASSERT(cio->cui_cl.cis_io == io);
@@ -315,9 +315,9 @@ static int ll_fault0(struct vm_area_struct *vma, struct vm_fault *vmf)
 		vio = vvp_env_io(env);
 		vio->u.fault.ft_vma       = vma;
 		vio->u.fault.ft_vmpage    = NULL;
-		vio->u.fault.fault.ft_vmf = vmf;
-		vio->u.fault.fault.ft_flags = 0;
-		vio->u.fault.fault.ft_flags_valid = 0;
+		vio->u.fault.ft_vmf = vmf;
+		vio->u.fault.ft_flags = 0;
+		vio->u.fault.ft_flags_valid = 0;
 
 		/* May call ll_readpage() */
 		ll_cl_add(vma->vm_file, env, io);
@@ -328,8 +328,8 @@ static int ll_fault0(struct vm_area_struct *vma, struct vm_fault *vmf)
 
 		/* ft_flags are only valid if we reached
 		 * the call to filemap_fault */
-		if (vio->u.fault.fault.ft_flags_valid)
-			fault_ret = vio->u.fault.fault.ft_flags;
+		if (vio->u.fault.ft_flags_valid)
+			fault_ret = vio->u.fault.ft_flags;
 
 		vmpage = vio->u.fault.ft_vmpage;
 		if (result != 0 && vmpage != NULL) {