AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

reiserfs: xattr reiserfs_get_page takes offset instead of index

Browse Source 
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>
This commit is contained in:
Jeff Mahoney 2009-03-30 14:02:30 -04:00 committed by Linus Torvalds
parent f437c529e3
commit ec6ea56b2f
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/reiserfs/xattr.c
View File

@ -376,14 +376,14 @@ static inline void reiserfs_put_page(struct page *page)
page_cache_release(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 address_space *mapping = dir->i_mapping;
struct page *page; struct page *page;
/* We can deadlock if we try to free dentries, /* We can deadlock if we try to free dentries,
and an unlink/rmdir has just occured - GFP_NOFS avoids this */ and an unlink/rmdir has just occured - GFP_NOFS avoids this */
mapping_set_gfp_mask(mapping, GFP_NOFS); 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)) { if (!IS_ERR(page)) {
kmap(page); kmap(page);
if (PageError(page)) if (PageError(page))
@ -470,8 +470,7 @@ reiserfs_xattr_set(struct inode *inode, const char *name, const void *buffer,
else else
chunk = buffer_size - buffer_pos; chunk = buffer_size - buffer_pos;
page = reiserfs_get_page(dentry->d_inode, page = reiserfs_get_page(dentry->d_inode, file_pos);
file_pos >> PAGE_CACHE_SHIFT);
if (IS_ERR(page)) { if (IS_ERR(page)) {
err = PTR_ERR(page); err = PTR_ERR(page);
goto out_filp; goto out_filp;
@ -577,8 +576,7 @@ reiserfs_xattr_get(const struct inode *inode, const char *name, void *buffer,
else else
chunk = isize - file_pos; chunk = isize - file_pos;
page = reiserfs_get_page(dentry->d_inode, page = reiserfs_get_page(dentry->d_inode, file_pos);
file_pos >> PAGE_CACHE_SHIFT);
if (IS_ERR(page)) { if (IS_ERR(page)) {
err = PTR_ERR(page); err = PTR_ERR(page);
goto out_dput; goto out_dput;