Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-5971 llite: merge ccc_io and vvp_io
[fs/lustre-release.git]
/
lustre
/
llite
/
llite_mmap.c
diff --git
a/lustre/llite/llite_mmap.c
b/lustre/llite/llite_mmap.c
index
7ead998
..
6836802
100644
(file)
--- 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) {
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);
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 = vvp_env_io(env);
vio->u.fault.ft_vma = vma;
vio->u.fault.ft_vmpage = NULL;
- vio->u.fault.f
ault.f
t_vmf = vmf;
- vio->u.fault.f
ault.f
t_flags = 0;
- vio->u.fault.f
ault.f
t_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);
/* 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 */
/* ft_flags are only valid if we reached
* the call to filemap_fault */
- if (vio->u.fault.f
ault.f
t_flags_valid)
- fault_ret = vio->u.fault.f
ault.f
t_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) {
vmpage = vio->u.fault.ft_vmpage;
if (result != 0 && vmpage != NULL) {