src/patches/suse-2.6.27.25/patches.suse/reiserfs-xattr-get-page

   1 From: Jeff Mahoney <jeffm@suse.com>
   2 Subject: reiserfs: xattr reiserfs_get_page takes offset instead of index
   3
   4  This patch changes reiserfs_get_page to take an
   5  offset rather than an index since no callers calculate the index
   6  differently.
   7
   8 Signed-off-by: Jeff Mahoney <jeffm@suse.com>
   9 ---
  10  fs/reiserfs/xattr.c |   10 ++++------
  11  1 file changed, 4 insertions(+), 6 deletions(-)
  12
  13 --- a/fs/reiserfs/xattr.c
  14 +++ b/fs/reiserfs/xattr.c
  15 @@ -376,14 +376,14 @@ static inline void reiserfs_put_page(str
  16         page_cache_release(page);
  17  }
  18
  19 -static struct page *reiserfs_get_page(struct inode *dir, unsigned long n)
  20 +static struct page *reiserfs_get_page(struct inode *dir, size_t n)
  21  {
  22         struct address_space *mapping = dir->i_mapping;
  23         struct page *page;
  24         /* We can deadlock if we try to free dentries,
  25            and an unlink/rmdir has just occured - GFP_NOFS avoids this */
  26         mapping_set_gfp_mask(mapping, GFP_NOFS);
  27 -       page = read_mapping_page(mapping, n, NULL);
  28 +       page = read_mapping_page(mapping, n >> PAGE_CACHE_SHIFT, NULL);
  29         if (!IS_ERR(page)) {
  30                 kmap(page);
  31                 if (PageError(page))
  32 @@ -470,8 +470,7 @@ reiserfs_xattr_set(struct inode *inode,
  33                 else
  34                         chunk = buffer_size - buffer_pos;
  35
  36 -               page = reiserfs_get_page(dentry->d_inode,
  37 -                                        file_pos >> PAGE_CACHE_SHIFT);
  38 +               page = reiserfs_get_page(dentry->d_inode, file_pos);
  39                 if (IS_ERR(page)) {
  40                         err = PTR_ERR(page);
  41                         goto out_filp;
  42 @@ -577,8 +576,7 @@ reiserfs_xattr_get(const struct inode *i
  43                 else
  44                         chunk = isize - file_pos;
  45
  46 -               page = reiserfs_get_page(dentry->d_inode,
  47 -                                        file_pos >> PAGE_CACHE_SHIFT);
  48 +               page = reiserfs_get_page(dentry->d_inode, file_pos);
  49                 if (IS_ERR(page)) {
  50                         err = PTR_ERR(page);
  51                         goto out_dput;