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-12400 llite: Use the new vm_fault_t type
[fs/lustre-release.git]
/
lustre
/
llite
/
llite_mmap.c
diff --git
a/lustre/llite/llite_mmap.c
b/lustre/llite/llite_mmap.c
index
e9552ae
..
1009c70
100644
(file)
--- a/
lustre/llite/llite_mmap.c
+++ b/
lustre/llite/llite_mmap.c
@@
-261,7
+261,7
@@
static inline int to_fault_error(int result)
* \retval VM_FAULT_ERROR on general error
* \retval NOPAGE_OOM not have memory for allocate new page
*/
* \retval VM_FAULT_ERROR on general error
* \retval NOPAGE_OOM not have memory for allocate new page
*/
-static
in
t ll_fault0(struct vm_area_struct *vma, struct vm_fault *vmf)
+static
vm_fault_
t ll_fault0(struct vm_area_struct *vma, struct vm_fault *vmf)
{
struct lu_env *env;
struct cl_io *io;
{
struct lu_env *env;
struct cl_io *io;
@@
-340,17
+340,17
@@
out:
}
#ifdef HAVE_VM_OPS_USE_VM_FAULT_ONLY
}
#ifdef HAVE_VM_OPS_USE_VM_FAULT_ONLY
-static
in
t ll_fault(struct vm_fault *vmf)
+static
vm_fault_
t ll_fault(struct vm_fault *vmf)
{
struct vm_area_struct *vma = vmf->vma;
#else
{
struct vm_area_struct *vma = vmf->vma;
#else
-static
in
t ll_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+static
vm_fault_
t ll_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
{
#endif
int count = 0;
bool printed = false;
bool cached;
{
#endif
int count = 0;
bool printed = false;
bool cached;
-
in
t result;
+
vm_fault_
t result;
sigset_t set;
ll_stats_ops_tally(ll_i2sbi(file_inode(vma->vm_file)),
sigset_t set;
ll_stats_ops_tally(ll_i2sbi(file_inode(vma->vm_file)),
@@
-398,18
+398,19
@@
restart:
}
#ifdef HAVE_VM_OPS_USE_VM_FAULT_ONLY
}
#ifdef HAVE_VM_OPS_USE_VM_FAULT_ONLY
-static
in
t ll_page_mkwrite(struct vm_fault *vmf)
+static
vm_fault_
t ll_page_mkwrite(struct vm_fault *vmf)
{
struct vm_area_struct *vma = vmf->vma;
#else
{
struct vm_area_struct *vma = vmf->vma;
#else
-static int ll_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
+static vm_fault_t ll_page_mkwrite(struct vm_area_struct *vma,
+ struct vm_fault *vmf)
{
#endif
int count = 0;
bool printed = false;
bool retry;
bool cached;
{
#endif
int count = 0;
bool printed = false;
bool retry;
bool cached;
-
in
t result;
+
vm_fault_
t result;
ll_stats_ops_tally(ll_i2sbi(file_inode(vma->vm_file)),
LPROC_LL_MKWRITE, 1);
ll_stats_ops_tally(ll_i2sbi(file_inode(vma->vm_file)),
LPROC_LL_MKWRITE, 1);