Skip to content

Commit

Permalink
reiserfs: xattr reiserfs_get_page takes offset instead of index
Browse files Browse the repository at this point in the history
This patch changes reiserfs_get_page to take an offset rather than an
index since no callers calculate the index differently.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jeff Mahoney authored and Linus Torvalds committed Mar 30, 2009
1 parent f437c52 commit ec6ea56
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions fs/reiserfs/xattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -376,14 +376,14 @@ static inline void reiserfs_put_page(struct page *page)
page_cache_release(page);
}

static struct page *reiserfs_get_page(struct inode *dir, unsigned long n)
static struct page *reiserfs_get_page(struct inode *dir, size_t n)
{
struct address_space *mapping = dir->i_mapping;
struct page *page;
/* We can deadlock if we try to free dentries,
and an unlink/rmdir has just occured - GFP_NOFS avoids this */
mapping_set_gfp_mask(mapping, GFP_NOFS);
page = read_mapping_page(mapping, n, NULL);
page = read_mapping_page(mapping, n >> PAGE_CACHE_SHIFT, NULL);
if (!IS_ERR(page)) {
kmap(page);
if (PageError(page))
Expand Down Expand Up @@ -470,8 +470,7 @@ reiserfs_xattr_set(struct inode *inode, const char *name, const void *buffer,
else
chunk = buffer_size - buffer_pos;

page = reiserfs_get_page(dentry->d_inode,
file_pos >> PAGE_CACHE_SHIFT);
page = reiserfs_get_page(dentry->d_inode, file_pos);
if (IS_ERR(page)) {
err = PTR_ERR(page);
goto out_filp;
Expand Down Expand Up @@ -577,8 +576,7 @@ reiserfs_xattr_get(const struct inode *inode, const char *name, void *buffer,
else
chunk = isize - file_pos;

page = reiserfs_get_page(dentry->d_inode,
file_pos >> PAGE_CACHE_SHIFT);
page = reiserfs_get_page(dentry->d_inode, file_pos);
if (IS_ERR(page)) {
err = PTR_ERR(page);
goto out_dput;
Expand Down

0 comments on commit ec6ea56

Please sign in to comment.