Skip to contentSkip to conversation

fs: nfs: Adding new return type vm_fault_t

PATCH In review Souptick Joarder 1 participant 3 messages Apr 14, 2018 – May 23, 2018

Subsystems (2)
NFS client NFS server
lore
Share & tools
lore

Souptick Joarder

author
#0 lore raw

PATCH 1/1 fs: nfs: Adding new return type vm_fault_t

Use new return type vm_fault_t for page_mkwrite
handler.

Signed-off-by Souptick Joarder <[email protected]>
Reviewed-by Matthew Wilcox <[email protected]>
---
 fs/nfs/file.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
fs/nfs/file.c +2 -2
index 81cca49..29553fd 100644
@@ -532,13 +532,13 @@ static void nfs_swap_deactivate(struct file *file)
  * writable, implying that someone is about to modify the page through a
  * shared-writable mapping
  */
-static int nfs_vm_page_mkwrite(struct vm_fault *vmf)
+static vm_fault_t nfs_vm_page_mkwrite(struct vm_fault *vmf)
 {
 	struct page *page = vmf->page;
 	struct file *filp = vmf->vma->vm_file;
 	struct inode *inode = file_inode(filp);
 	unsigned pagelen;
-	int ret = VM_FAULT_NOPAGE;
+	vm_fault_t ret = VM_FAULT_NOPAGE;
 	struct address_space *mapping;
 
 	dfprintk(PAGECACHE, "NFS: vm_page_mkwrite(%pD2(%lu), offset %lld)\n",

--
1.9.1

author
#1 lore raw
Quoted 30 lines · Souptick Joarder

Use new return type vm_fault_t for page_mkwrite
handler.

Signed-off-by Souptick Joarder <[email protected]>
Reviewed-by Matthew Wilcox <[email protected]>
---
 fs/nfs/file.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
fs/nfs/file.c +2 -3
index 81cca49..29553fd 100644
@@ -532,13 +532,13 @@ static void nfs_swap_deactivate(struct file *file)
  * writable, implying that someone is about to modify the page through a
  * shared-writable mapping
  */
-static int nfs_vm_page_mkwrite(struct vm_fault *vmf)
+static vm_fault_t nfs_vm_page_mkwrite(struct vm_fault *vmf)
 {
        struct page *page = vmf->page;
        struct file *filp = vmf->vma->vm_file;
        struct inode *inode = file_inode(filp);
        unsigned pagelen;
-       int ret = VM_FAULT_NOPAGE;
+       vm_fault_t ret = VM_FAULT_NOPAGE;
        struct address_space *mapping;
 
        dfprintk(PAGECACHE, "NFS: vm_page_mkwrite(%pD2(%lu), offset %lld)\n",
--
Quoted 2 lines

1.9.1

Any comment for this patch ? We would like to get this patch queued for 4.18.

author
#2 lore raw
Quoted 29 lines · Souptick Joarder
Quoted 28 lines · Souptick Joarder

Use new return type vm_fault_t for page_mkwrite
handler.

Signed-off-by Souptick Joarder <[email protected]>
Reviewed-by Matthew Wilcox <[email protected]>
---
 fs/nfs/file.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
fs/nfs/file.c +2 -2
index 81cca49..29553fd 100644
@@ -532,13 +532,13 @@ static void nfs_swap_deactivate(struct file *file)
  * writable, implying that someone is about to modify the page through a
  * shared-writable mapping
  */
-static int nfs_vm_page_mkwrite(struct vm_fault *vmf)
+static vm_fault_t nfs_vm_page_mkwrite(struct vm_fault *vmf)
 {
        struct page *page = vmf->page;
        struct file *filp = vmf->vma->vm_file;
        struct inode *inode = file_inode(filp);
        unsigned pagelen;
-       int ret = VM_FAULT_NOPAGE;
+       vm_fault_t ret = VM_FAULT_NOPAGE;
        struct address_space *mapping;
Quoted 7 lines
Quoted 4 lines
fs/nfs/file.c +0 -1
        dfprintk(PAGECACHE, "NFS: vm_page_mkwrite(%pD2(%lu), offset %lld)\n",
--

1.9.1

Any comment for this patch ? We would like to get this patch queued for 4.18.

If no comment, We would like to get this patch in queue for 4.18.