orangefs: Adding new return type vm_fault_t
PATCH 1/1 orangefs: Adding new return type vm_fault_t
Use new return type vm_fault_t for fault handler. For now, this is just documenting that the function returns a VM_FAULT value rather than an errno. Once all instances are converted, vm_fault_t will become a distinct type.
See the following
commit 1c8f422059ae ("mm: change return type to vm_fault_t")
Fixed checkpatch.pl warning.
--- fs/orangefs/file.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
fs/orangefs/file.c +10 -9
@@ -528,18 +528,19 @@ static long orangefs_ioctl(struct file *file, unsigned int cmd, unsigned long arreturn ret; } -static int orangefs_fault (struct vm_fault *vmf) +static vm_fault_t orangefs_fault (struct vm_fault *vmf) {struct file *file = vmf->vma->vm_file; -int rc; - rc =orangefs_inode_getattr (file->f_mapping->host,0 ,1 , +int ret; + + ret =orangefs_inode_getattr (file->f_mapping->host,0 ,1 ,STATX_SIZE ); -if (rc == -ESTALE ) - rc = -EIO ; -if (rc) { -gossip_err ("%s: orangefs_inode_getattr failed, " -"rc:%d:.\n" , __func__, rc); -return rc; +if (ret == -ESTALE ) + ret = -EIO ; +if (ret) { +gossip_err ("%s: orangefs_inode_getattr failed, ret:%d:.\n" , + __func__, ret); +return VM_FAULT_SIGBUS ; }return filemap_fault (vmf); }
Signature · 1 line
1.9.1
Quoted 49 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault handler. For now, this is just documenting that the function returns aVM_FAULTvalue rather than an errno. Once all instances are converted,vm_fault_twill become a distinct type.See the following
commit1c8f422059ae("mm: change return type tovm_fault_t")Fixed checkpatch.pl warning.
Signed-off-by Souptick Joarder <[email protected]>--- fs/orangefs/file.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)fs/orangefs/file.c +10
-10@@ -528,18 +528,19 @@ static long orangefs_ioctl(struct file *file, unsigned int cmd, unsigned long arreturn ret; } -static int orangefs_fault (struct vm_fault *vmf) +static vm_fault_t orangefs_fault (struct vm_fault *vmf) {struct file *file = vmf->vma->vm_file; -int rc; - rc =orangefs_inode_getattr (file->f_mapping->host,0 ,1 , +int ret; + + ret =orangefs_inode_getattr (file->f_mapping->host,0 ,1 ,STATX_SIZE ); -if (rc == -ESTALE ) - rc = -EIO ; -if (rc) { -gossip_err ("%s: orangefs_inode_getattr failed, " -"rc:%d:.\n" , __func__, rc); -return rc; +if (ret == -ESTALE ) + ret = -EIO ; +if (ret) { +gossip_err ("%s: orangefs_inode_getattr failed, ret:%d:.\n" , + __func__, ret); +return VM_FAULT_SIGBUS ; }return filemap_fault (vmf); } --
Quoted 2 lines
1.9.1
Any comment for this patch ?
Mike Marshall
maintainerSouptick Joarder: Any comment for this patch?
Thanks for sending it <g>...
I have it in my stack, but I haven't studied it, or xfstested it yet, so no useful comments yet...
-Mike
Quoted 54 lines · Souptick Joarder
Quoted 49 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault handler. For now, this is just documenting that the function returns aVM_FAULTvalue rather than an errno. Once all instances are converted,vm_fault_twill become a distinct type.See the following
commit1c8f422059ae("mm: change return type tovm_fault_t")Fixed checkpatch.pl warning.
Signed-off-by Souptick Joarder <[email protected]>--- fs/orangefs/file.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)fs/orangefs/file.c +10
-10@@ -528,18 +528,19 @@ static long orangefs_ioctl(struct file *file, unsigned int cmd, unsigned long arreturn ret; } -static int orangefs_fault (struct vm_fault *vmf) +static vm_fault_t orangefs_fault (struct vm_fault *vmf) {struct file *file = vmf->vma->vm_file; -int rc; - rc =orangefs_inode_getattr (file->f_mapping->host,0 ,1 , +int ret; + + ret =orangefs_inode_getattr (file->f_mapping->host,0 ,1 ,STATX_SIZE ); -if (rc == -ESTALE ) - rc = -EIO ; -if (rc) { -gossip_err ("%s: orangefs_inode_getattr failed, " -"rc:%d:.\n" , __func__, rc); -return rc; +if (ret == -ESTALE ) + ret = -EIO ; +if (ret) { +gossip_err ("%s: orangefs_inode_getattr failed, ret:%d:.\n" , + __func__, ret); +return VM_FAULT_SIGBUS ; }return filemap_fault (vmf); } --Quoted 2 lines
1.9.1
Any comment for this patch ?
Mike Marshall
maintainerHi...
I applied this patch to 4.18.0-rc4. It applied cleanly and there's no xfstests regressions. Sorry if I held you up any...
You can add: Tested-By: Mike Marshall <[email protected]>
-Mike
Quoted 66 lines · Mike Marshall
Souptick Joarder: Any comment for this patch?
Thanks for sending it <g>...
I have it in my stack, but I haven't studied it, or xfstested it yet, so no useful comments yet...
-Mike
Quoted 54 lines · Souptick Joarder
Quoted 49 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault handler. For now, this is just documenting that the function returns aVM_FAULTvalue rather than an errno. Once all instances are converted,vm_fault_twill become a distinct type.See the following
commit1c8f422059ae("mm: change return type tovm_fault_t")Fixed checkpatch.pl warning.
Signed-off-by Souptick Joarder <[email protected]>--- fs/orangefs/file.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)fs/orangefs/file.c +10
-10@@ -528,18 +528,19 @@ static long orangefs_ioctl(struct file *file, unsigned int cmd, unsigned long arreturn ret; } -static int orangefs_fault (struct vm_fault *vmf) +static vm_fault_t orangefs_fault (struct vm_fault *vmf) {struct file *file = vmf->vma->vm_file; -int rc; - rc =orangefs_inode_getattr (file->f_mapping->host,0 ,1 , +int ret; + + ret =orangefs_inode_getattr (file->f_mapping->host,0 ,1 ,STATX_SIZE ); -if (rc == -ESTALE ) - rc = -EIO ; -if (rc) { -gossip_err ("%s: orangefs_inode_getattr failed, " -"rc:%d:.\n" , __func__, rc); -return rc; +if (ret == -ESTALE ) + ret = -EIO ; +if (ret) { +gossip_err ("%s: orangefs_inode_getattr failed, ret:%d:.\n" , + __func__, ret); +return VM_FAULT_SIGBUS ; }return filemap_fault (vmf); } --Quoted 2 lines
1.9.1
Any comment for this patch ?
Quoted 7 lines · Mike Marshall
Hi...
I applied this patch to 4.18.0-rc4. It applied cleanly and there's no xfstests regressions. Sorry if I held you up any...
You can add: Tested-By: Mike Marshall <[email protected]>
Thanks Mike. Can we get this patch in queue for 4.19 merge window ?
Quoted 69 lines
-Mike
Quoted 66 lines · Mike Marshall
Souptick Joarder: Any comment for this patch?
Thanks for sending it <g>...
I have it in my stack, but I haven't studied it, or xfstested it yet, so no useful comments yet...
-Mike
Quoted 54 lines · Souptick Joarder
Quoted 49 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault handler. For now, this is just documenting that the function returns aVM_FAULTvalue rather than an errno. Once all instances are converted,vm_fault_twill become a distinct type.See the following
commit1c8f422059ae("mm: change return type tovm_fault_t")Fixed checkpatch.pl warning.
Signed-off-by Souptick Joarder <[email protected]>--- fs/orangefs/file.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)fs/orangefs/file.c +10
-10@@ -528,18 +528,19 @@ static long orangefs_ioctl(struct file *file, unsigned int cmd, unsigned long arreturn ret; } -static int orangefs_fault (struct vm_fault *vmf) +static vm_fault_t orangefs_fault (struct vm_fault *vmf) {struct file *file = vmf->vma->vm_file; -int rc; - rc =orangefs_inode_getattr (file->f_mapping->host,0 ,1 , +int ret; + + ret =orangefs_inode_getattr (file->f_mapping->host,0 ,1 ,STATX_SIZE ); -if (rc == -ESTALE ) - rc = -EIO ; -if (rc) { -gossip_err ("%s: orangefs_inode_getattr failed, " -"rc:%d:.\n" , __func__, rc); -return rc; +if (ret == -ESTALE ) + ret = -EIO ; +if (ret) { +gossip_err ("%s: orangefs_inode_getattr failed, ret:%d:.\n" , + __func__, ret); +return VM_FAULT_SIGBUS ; }return filemap_fault (vmf); } --Quoted 2 lines
1.9.1
Any comment for this patch ?
Mike Marshall
maintainerYes, I'd be happy to send it in at the 4.19 merge window...
-Mike
Quoted 80 lines · Souptick Joarder
Quoted 7 lines · Mike Marshall
Hi...
I applied this patch to 4.18.0-rc4. It applied cleanly and there's no xfstests regressions. Sorry if I held you up any...
You can add: Tested-By: Mike Marshall <[email protected]>
Thanks Mike. Can we get this patch in queue for 4.19 merge window ?
Quoted 69 lines
-Mike
Quoted 66 lines · Mike Marshall
Souptick Joarder: Any comment for this patch?
Thanks for sending it <g>...
I have it in my stack, but I haven't studied it, or xfstested it yet, so no useful comments yet...
-Mike
Quoted 54 lines · Souptick Joarder
Quoted 49 lines · Souptick Joarder
Use new return type
vm_fault_tfor fault handler. For now, this is just documenting that the function returns aVM_FAULTvalue rather than an errno. Once all instances are converted,vm_fault_twill become a distinct type.See the following
commit1c8f422059ae("mm: change return type tovm_fault_t")Fixed checkpatch.pl warning.
Signed-off-by Souptick Joarder <[email protected]>--- fs/orangefs/file.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)fs/orangefs/file.c +10
-10@@ -528,18 +528,19 @@ static long orangefs_ioctl(struct file *file, unsigned int cmd, unsigned long arreturn ret; } -static int orangefs_fault (struct vm_fault *vmf) +static vm_fault_t orangefs_fault (struct vm_fault *vmf) {struct file *file = vmf->vma->vm_file; -int rc; - rc =orangefs_inode_getattr (file->f_mapping->host,0 ,1 , +int ret; + + ret =orangefs_inode_getattr (file->f_mapping->host,0 ,1 ,STATX_SIZE ); -if (rc == -ESTALE ) - rc = -EIO ; -if (rc) { -gossip_err ("%s: orangefs_inode_getattr failed, " -"rc:%d:.\n" , __func__, rc); -return rc; +if (ret == -ESTALE ) + ret = -EIO ; +if (ret) { +gossip_err ("%s: orangefs_inode_getattr failed, ret:%d:.\n" , + __func__, ret); +return VM_FAULT_SIGBUS ; }return filemap_fault (vmf); } --Quoted 2 lines
1.9.1
Any comment for this patch ?