use-new-return-type-vm_fault_t

   1 ext4: use new return type vm_fault_t
   2
   3 From: Souptick Joarder <jrdr.linux@gmail.com>
   4
   5 Use new return type vm_fault_t for fault handler
   6 ext4_filemap_fault.
   7
   8 Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
   9 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  10 ---
  11  fs/ext4/ext4.h              |  4 ++--
  12  fs/ext4/inode.c             | 32 ++++++++++++++++----------------
  13  include/linux/buffer_head.h |  3 ++-
  14  3 files changed, 20 insertions(+), 19 deletions(-)
  15
  16 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
  17 index 6d7dec48372b..21fb1964a672 100644
  18 --- a/fs/ext4/ext4.h
  19 +++ b/fs/ext4/ext4.h
  20 @@ -2468,8 +2468,8 @@ extern int ext4_writepage_trans_blocks(struct inode *);
  21  extern int ext4_chunk_trans_blocks(struct inode *, int nrblocks);
  22  extern int ext4_zero_partial_blocks(handle_t *handle, struct inode *inode,
  23                              loff_t lstart, loff_t lend);
  24 -extern int ext4_page_mkwrite(struct vm_fault *vmf);
  25 -extern int ext4_filemap_fault(struct vm_fault *vmf);
  26 +extern vm_fault_t ext4_page_mkwrite(struct vm_fault *vmf);
  27 +extern vm_fault_t ext4_filemap_fault(struct vm_fault *vmf);
  28  extern qsize_t *ext4_get_reserved_space(struct inode *inode);
  29  extern int ext4_get_projid(struct inode *inode, kprojid_t *projid);
  30  extern void ext4_da_update_reserve_space(struct inode *inode,
  31 diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
  32 index ba0de19fb1ad..a6da9eda2194 100644
  33 --- a/fs/ext4/inode.c
  34 +++ b/fs/ext4/inode.c
  35 @@ -6107,27 +6107,27 @@ static int ext4_bh_unmapped(handle_t *handle, struct buffer_head *bh)
  36         return !buffer_mapped(bh);
  37  }
  38
  39 -int ext4_page_mkwrite(struct vm_fault *vmf)
  40 +vm_fault_t ext4_page_mkwrite(struct vm_fault *vmf)
  41  {
  42         struct vm_area_struct *vma = vmf->vma;
  43         struct page *page = vmf->page;
  44         loff_t size;
  45         unsigned long len;
  46 -       int ret;
  47 +       vm_fault_t ret;
  48         struct file *file = vma->vm_file;
  49         struct inode *inode = file_inode(file);
  50         struct address_space *mapping = inode->i_mapping;
  51         handle_t *handle;
  52         get_block_t *get_block;
  53 -       int retries = 0;
  54 +       int retries = 0, err;
  55
  56         sb_start_pagefault(inode->i_sb);
  57         file_update_time(vma->vm_file);
  58
  59         down_read(&EXT4_I(inode)->i_mmap_sem);
  60
  61 -       ret = ext4_convert_inline_data(inode);
  62 -       if (ret)
  63 +       err = ext4_convert_inline_data(inode);
  64 +       if (err)
  65                 goto out_ret;
  66
  67         /* Delalloc case is easy... */
  68 @@ -6135,9 +6135,9 @@ int ext4_page_mkwrite(struct vm_fault *vmf)
  69             !ext4_should_journal_data(inode) &&
  70             !ext4_nonda_switch(inode->i_sb)) {
  71                 do {
  72 -                       ret = block_page_mkwrite(vma, vmf,
  73 -                                                  ext4_da_get_block_prep);
  74 -               } while (ret == -ENOSPC &&
  75 +                       err = block_page_mkwrite(vma, vmf,
  76 +                                                ext4_da_get_block_prep);
  77 +               } while (err == -ENOSPC &&
  78                        ext4_should_retry_alloc(inode->i_sb, &retries));
  79                 goto out_ret;
  80         }
  81 @@ -6182,8 +6182,8 @@ int ext4_page_mkwrite(struct vm_fault *vmf)
  82                 ret = VM_FAULT_SIGBUS;
  83                 goto out;
  84         }
  85 -       ret = block_page_mkwrite(vma, vmf, get_block);
  86 -       if (!ret && ext4_should_journal_data(inode)) {
  87 +       err = block_page_mkwrite(vma, vmf, get_block);
  88 +       if (!err && ext4_should_journal_data(inode)) {
  89                 if (ext4_walk_page_buffers(handle, page_buffers(page), 0,
  90                           PAGE_SIZE, NULL, do_journal_get_write_access)) {
  91                         unlock_page(page);
  92 @@ -6194,24 +6194,24 @@ int ext4_page_mkwrite(struct vm_fault *vmf)
  93                 ext4_set_inode_state(inode, EXT4_STATE_JDATA);
  94         }
  95         ext4_journal_stop(handle);
  96 -       if (ret == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))
  97 +       if (err == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))
  98                 goto retry_alloc;
  99  out_ret:
 100 -       ret = block_page_mkwrite_return(ret);
 101 +       ret = block_page_mkwrite_return(err);
 102  out:
 103         up_read(&EXT4_I(inode)->i_mmap_sem);
 104         sb_end_pagefault(inode->i_sb);
 105         return ret;
 106  }
 107
 108 -int ext4_filemap_fault(struct vm_fault *vmf)
 109 +vm_fault_t ext4_filemap_fault(struct vm_fault *vmf)
 110  {
 111         struct inode *inode = file_inode(vmf->vma->vm_file);
 112 -       int err;
 113 +       vm_fault_t ret;
 114
 115         down_read(&EXT4_I(inode)->i_mmap_sem);
 116 -       err = filemap_fault(vmf);
 117 +       ret = filemap_fault(vmf);
 118         up_read(&EXT4_I(inode)->i_mmap_sem);
 119
 120 -       return err;
 121 +       return ret;
 122  }
 123 diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
 124 index 96225a77c112..ed7a81b8f7cc 100644
 125 --- a/include/linux/buffer_head.h
 126 +++ b/include/linux/buffer_head.h
 127 @@ -14,6 +14,7 @@
 128  #include <linux/pagemap.h>
 129  #include <linux/wait.h>
 130  #include <linux/atomic.h>
 131 +#include <linux/mm_types.h>
 132
 133  #ifdef CONFIG_BLOCK
 134
 135 @@ -242,7 +243,7 @@ int block_commit_write(struct page *page, unsigned from, unsigned to);
 136  int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
 137                                 get_block_t get_block);
 138  /* Convert errno to return value from ->page_mkwrite() call */
 139 -static inline int block_page_mkwrite_return(int err)
 140 +static inline vm_fault_t block_page_mkwrite_return(int err)
 141  {
 142         if (err == 0)
 143                 return VM_FAULT_LOCKED;