aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext2/xattr.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext2/xattr.c')
-rw-r--r--fs/ext2/xattr.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index 5ab87e6edffc..8c29ae15129e 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -843,7 +843,7 @@ ext2_xattr_cache_insert(struct buffer_head *bh)
843 ce = mb_cache_entry_alloc(ext2_xattr_cache, GFP_NOFS); 843 ce = mb_cache_entry_alloc(ext2_xattr_cache, GFP_NOFS);
844 if (!ce) 844 if (!ce)
845 return -ENOMEM; 845 return -ENOMEM;
846 error = mb_cache_entry_insert(ce, bh->b_bdev, bh->b_blocknr, &hash); 846 error = mb_cache_entry_insert(ce, bh->b_bdev, bh->b_blocknr, hash);
847 if (error) { 847 if (error) {
848 mb_cache_entry_free(ce); 848 mb_cache_entry_free(ce);
849 if (error == -EBUSY) { 849 if (error == -EBUSY) {
@@ -917,8 +917,8 @@ ext2_xattr_cache_find(struct inode *inode, struct ext2_xattr_header *header)
917 return NULL; /* never share */ 917 return NULL; /* never share */
918 ea_idebug(inode, "looking for cached blocks [%x]", (int)hash); 918 ea_idebug(inode, "looking for cached blocks [%x]", (int)hash);
919again: 919again:
920 ce = mb_cache_entry_find_first(ext2_xattr_cache, 0, 920 ce = mb_cache_entry_find_first(ext2_xattr_cache, inode->i_sb->s_bdev,
921 inode->i_sb->s_bdev, hash); 921 hash);
922 while (ce) { 922 while (ce) {
923 struct buffer_head *bh; 923 struct buffer_head *bh;
924 924
@@ -950,7 +950,7 @@ again:
950 unlock_buffer(bh); 950 unlock_buffer(bh);
951 brelse(bh); 951 brelse(bh);
952 } 952 }
953 ce = mb_cache_entry_find_next(ce, 0, inode->i_sb->s_bdev, hash); 953 ce = mb_cache_entry_find_next(ce, inode->i_sb->s_bdev, hash);
954 } 954 }
955 return NULL; 955 return NULL;
956} 956}
@@ -1026,9 +1026,7 @@ static void ext2_xattr_rehash(struct ext2_xattr_header *header,
1026int __init 1026int __init
1027init_ext2_xattr(void) 1027init_ext2_xattr(void)
1028{ 1028{
1029 ext2_xattr_cache = mb_cache_create("ext2_xattr", NULL, 1029 ext2_xattr_cache = mb_cache_create("ext2_xattr", 6);
1030 sizeof(struct mb_cache_entry) +
1031 sizeof(((struct mb_cache_entry *) 0)->e_indexes[0]), 1, 6);
1032 if (!ext2_xattr_cache) 1030 if (!ext2_xattr_cache)
1033 return -ENOMEM; 1031 return -ENOMEM;
1034 return 0; 1032 return 0;