use-invalidatepage-length-argument

   1 ext4: use ->invalidatepage() length argument
   2
   3 From: Lukas Czerner <lczerner@redhat.com>
   4
   5 ->invalidatepage() aop now accepts range to invalidate so we can make
   6 use of it in all ext4 invalidatepage routines.
   7
   8 Signed-off-by: Lukas Czerner <lczerner@redhat.com>
   9 Reviewed-by: Jan Kara <jack@suse.cz>
  10 ---
  11  fs/ext4/inode.c             |   30 +++++++++++++++++++-----------
  12  include/trace/events/ext4.h |   22 ++++++++++++----------
  13  2 files changed, 31 insertions(+), 21 deletions(-)
  14
  15 diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
  16 index 96d5927..ae58749 100644
  17 --- a/fs/ext4/inode.c
  18 +++ b/fs/ext4/inode.c
  19 @@ -1415,21 +1415,28 @@ static void ext4_da_release_space(struct inode *inode, int to_free)
  20  }
  21
  22  static void ext4_da_page_release_reservation(struct page *page,
  23 -                                            unsigned long offset)
  24 +                                            unsigned int offset,
  25 +                                            unsigned int length)
  26  {
  27         int to_release = 0;
  28         struct buffer_head *head, *bh;
  29         unsigned int curr_off = 0;
  30         struct inode *inode = page->mapping->host;
  31         struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
  32 +       unsigned int stop = offset + length;
  33         int num_clusters;
  34         ext4_fsblk_t lblk;
  35
  36 +       BUG_ON(stop > PAGE_CACHE_SIZE || stop < length);
  37 +
  38         head = page_buffers(page);
  39         bh = head;
  40         do {
  41                 unsigned int next_off = curr_off + bh->b_size;
  42
  43 +               if (next_off > stop)
  44 +                       break;
  45 +
  46                 if ((offset <= curr_off) && (buffer_delay(bh))) {
  47                         to_release++;
  48                         clear_buffer_delay(bh);
  49 @@ -2839,7 +2846,7 @@ static void ext4_da_invalidatepage(struct page *page, unsigned int offset,
  50         if (!page_has_buffers(page))
  51                 goto out;
  52
  53 -       ext4_da_page_release_reservation(page, offset);
  54 +       ext4_da_page_release_reservation(page, offset, length);
  55
  56  out:
  57         ext4_invalidatepage(page, offset, length);
  58 @@ -2993,29 +3000,29 @@ ext4_readpages(struct file *file, struct address_space *mapping,
  59  static void ext4_invalidatepage(struct page *page, unsigned int offset,
  60                                 unsigned int length)
  61  {
  62 -       trace_ext4_invalidatepage(page, offset);
  63 +       trace_ext4_invalidatepage(page, offset, length);
  64
  65         /* No journalling happens on data buffers when this function is used */
  66         WARN_ON(page_has_buffers(page) && buffer_jbd(page_buffers(page)));
  67
  68 -       block_invalidatepage(page, offset, PAGE_CACHE_SIZE - offset);
  69 +       block_invalidatepage(page, offset, length);
  70  }
  71
  72  static int __ext4_journalled_invalidatepage(struct page *page,
  73 -                                           unsigned long offset)
  74 +                                           unsigned int offset,
  75 +                                           unsigned int length)
  76  {
  77         journal_t *journal = EXT4_JOURNAL(page->mapping->host);
  78
  79 -       trace_ext4_journalled_invalidatepage(page, offset);
  80 +       trace_ext4_journalled_invalidatepage(page, offset, length);
  81
  82         /*
  83          * If it's a full truncate we just forget about the pending dirtying
  84          */
  85 -       if (offset == 0)
  86 +       if (offset == 0 && length == PAGE_CACHE_SIZE)
  87                 ClearPageChecked(page);
  88
  89 -       return jbd2_journal_invalidatepage(journal, page, offset,
  90 -                                          PAGE_CACHE_SIZE - offset);
  91 +       return jbd2_journal_invalidatepage(journal, page, offset, length);
  92  }
  93
  94  /* Wrapper for aops... */
  95 @@ -3023,7 +3030,7 @@ static void ext4_journalled_invalidatepage(struct page *page,
  96                                            unsigned int offset,
  97                                            unsigned int length)
  98  {
  99 -       WARN_ON(__ext4_journalled_invalidatepage(page, offset) < 0);
 100 +       WARN_ON(__ext4_journalled_invalidatepage(page, offset, length) < 0);
 101  }
 102
 103  static int ext4_releasepage(struct page *page, gfp_t wait)
 104 @@ -4627,7 +4634,8 @@ static void ext4_wait_for_tail_page_commit(struct inode *inode)
 105                                       inode->i_size >> PAGE_CACHE_SHIFT);
 106                 if (!page)
 107                         return;
 108 -               ret = __ext4_journalled_invalidatepage(page, offset);
 109 +               ret = __ext4_journalled_invalidatepage(page, offset,
 110 +                                               PAGE_CACHE_SIZE - offset);
 111                 unlock_page(page);
 112                 page_cache_release(page);
 113                 if (ret != -EBUSY)
 114 diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
 115 index 8ee15b9..dcfce96 100644
 116 --- a/include/trace/events/ext4.h
 117 +++ b/include/trace/events/ext4.h
 118 @@ -444,16 +444,16 @@ DEFINE_EVENT(ext4__page_op, ext4_releasepage,
 119  );
 120
 121  DECLARE_EVENT_CLASS(ext4_invalidatepage_op,
 122 -       TP_PROTO(struct page *page, unsigned long offset),
 123 +       TP_PROTO(struct page *page, unsigned int offset, unsigned int length),
 124
 125 -       TP_ARGS(page, offset),
 126 +       TP_ARGS(page, offset, length),
 127
 128         TP_STRUCT__entry(
 129                 __field(        dev_t,  dev                     )
 130                 __field(        ino_t,  ino                     )
 131                 __field(        pgoff_t, index                  )
 132 -               __field(        unsigned long, offset           )
 133 -
 134 +               __field(        unsigned int, offset            )
 135 +               __field(        unsigned int, length            )
 136         ),
 137
 138         TP_fast_assign(
 139 @@ -461,24 +461,26 @@ DECLARE_EVENT_CLASS(ext4_invalidatepage_op,
 140                 __entry->ino    = page->mapping->host->i_ino;
 141                 __entry->index  = page->index;
 142                 __entry->offset = offset;
 143 +               __entry->length = length;
 144         ),
 145
 146 -       TP_printk("dev %d,%d ino %lu page_index %lu offset %lu",
 147 +       TP_printk("dev %d,%d ino %lu page_index %lu offset %u length %u",
 148                   MAJOR(__entry->dev), MINOR(__entry->dev),
 149                   (unsigned long) __entry->ino,
 150 -                 (unsigned long) __entry->index, __entry->offset)
 151 +                 (unsigned long) __entry->index,
 152 +                 __entry->offset, __entry->length)
 153  );
 154
 155  DEFINE_EVENT(ext4_invalidatepage_op, ext4_invalidatepage,
 156 -       TP_PROTO(struct page *page, unsigned long offset),
 157 +       TP_PROTO(struct page *page, unsigned int offset, unsigned int length),
 158
 159 -       TP_ARGS(page, offset)
 160 +       TP_ARGS(page, offset, length)
 161  );
 162
 163  DEFINE_EVENT(ext4_invalidatepage_op, ext4_journalled_invalidatepage,
 164 -       TP_PROTO(struct page *page, unsigned long offset),
 165 +       TP_PROTO(struct page *page, unsigned int offset, unsigned int length),
 166
 167 -       TP_ARGS(page, offset)
 168 +       TP_ARGS(page, offset, length)
 169  );
 170
 171  TRACE_EVENT(ext4_discard_blocks,
 172 --
 173 1.7.7.6
 174
 175 --
 176 To unsubscribe, send a message with 'unsubscribe linux-mm' in
 177 the body to majordomo@kvack.org.  For more info on Linux MM,
 178 see: http://www.linux-mm.org/ .
 179 Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
 180