aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs/xattr.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/reiserfs/xattr.c')
-rw-r--r--fs/reiserfs/xattr.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
index 57e0b2310532..28f5f8b11370 100644
--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
@@ -415,7 +415,7 @@ out:
415static inline void reiserfs_put_page(struct page *page) 415static inline void reiserfs_put_page(struct page *page)
416{ 416{
417 kunmap(page); 417 kunmap(page);
418 page_cache_release(page); 418 put_page(page);
419} 419}
420 420
421static struct page *reiserfs_get_page(struct inode *dir, size_t n) 421static struct page *reiserfs_get_page(struct inode *dir, size_t n)
@@ -427,7 +427,7 @@ static struct page *reiserfs_get_page(struct inode *dir, size_t n)
427 * and an unlink/rmdir has just occurred - GFP_NOFS avoids this 427 * and an unlink/rmdir has just occurred - GFP_NOFS avoids this
428 */ 428 */
429 mapping_set_gfp_mask(mapping, GFP_NOFS); 429 mapping_set_gfp_mask(mapping, GFP_NOFS);
430 page = read_mapping_page(mapping, n >> PAGE_CACHE_SHIFT, NULL); 430 page = read_mapping_page(mapping, n >> PAGE_SHIFT, NULL);
431 if (!IS_ERR(page)) { 431 if (!IS_ERR(page)) {
432 kmap(page); 432 kmap(page);
433 if (PageError(page)) 433 if (PageError(page))
@@ -526,10 +526,10 @@ reiserfs_xattr_set_handle(struct reiserfs_transaction_handle *th,
526 while (buffer_pos < buffer_size || buffer_pos == 0) { 526 while (buffer_pos < buffer_size || buffer_pos == 0) {
527 size_t chunk; 527 size_t chunk;
528 size_t skip = 0; 528 size_t skip = 0;
529 size_t page_offset = (file_pos & (PAGE_CACHE_SIZE - 1)); 529 size_t page_offset = (file_pos & (PAGE_SIZE - 1));
530 530
531 if (buffer_size - buffer_pos > PAGE_CACHE_SIZE) 531 if (buffer_size - buffer_pos > PAGE_SIZE)
532 chunk = PAGE_CACHE_SIZE; 532 chunk = PAGE_SIZE;
533 else 533 else
534 chunk = buffer_size - buffer_pos; 534 chunk = buffer_size - buffer_pos;
535 535
@@ -546,8 +546,8 @@ reiserfs_xattr_set_handle(struct reiserfs_transaction_handle *th,
546 struct reiserfs_xattr_header *rxh; 546 struct reiserfs_xattr_header *rxh;
547 547
548 skip = file_pos = sizeof(struct reiserfs_xattr_header); 548 skip = file_pos = sizeof(struct reiserfs_xattr_header);
549 if (chunk + skip > PAGE_CACHE_SIZE) 549 if (chunk + skip > PAGE_SIZE)
550 chunk = PAGE_CACHE_SIZE - skip; 550 chunk = PAGE_SIZE - skip;
551 rxh = (struct reiserfs_xattr_header *)data; 551 rxh = (struct reiserfs_xattr_header *)data;
552 rxh->h_magic = cpu_to_le32(REISERFS_XATTR_MAGIC); 552 rxh->h_magic = cpu_to_le32(REISERFS_XATTR_MAGIC);
553 rxh->h_hash = cpu_to_le32(xahash); 553 rxh->h_hash = cpu_to_le32(xahash);
@@ -675,8 +675,8 @@ reiserfs_xattr_get(struct inode *inode, const char *name, void *buffer,
675 char *data; 675 char *data;
676 size_t skip = 0; 676 size_t skip = 0;
677 677
678 if (isize - file_pos > PAGE_CACHE_SIZE) 678 if (isize - file_pos > PAGE_SIZE)
679 chunk = PAGE_CACHE_SIZE; 679 chunk = PAGE_SIZE;
680 else 680 else
681 chunk = isize - file_pos; 681 chunk = isize - file_pos;
682 682