diff options
Diffstat (limited to 'fs/ext4')
-rw-r--r-- | fs/ext4/xattr.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index 04338009793a..1c93198353e7 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c | |||
@@ -1418,7 +1418,7 @@ ext4_xattr_cache_insert(struct buffer_head *bh) | |||
1418 | ea_bdebug(bh, "out of memory"); | 1418 | ea_bdebug(bh, "out of memory"); |
1419 | return; | 1419 | return; |
1420 | } | 1420 | } |
1421 | error = mb_cache_entry_insert(ce, bh->b_bdev, bh->b_blocknr, &hash); | 1421 | error = mb_cache_entry_insert(ce, bh->b_bdev, bh->b_blocknr, hash); |
1422 | if (error) { | 1422 | if (error) { |
1423 | mb_cache_entry_free(ce); | 1423 | mb_cache_entry_free(ce); |
1424 | if (error == -EBUSY) { | 1424 | if (error == -EBUSY) { |
@@ -1490,8 +1490,8 @@ ext4_xattr_cache_find(struct inode *inode, struct ext4_xattr_header *header, | |||
1490 | return NULL; /* never share */ | 1490 | return NULL; /* never share */ |
1491 | ea_idebug(inode, "looking for cached blocks [%x]", (int)hash); | 1491 | ea_idebug(inode, "looking for cached blocks [%x]", (int)hash); |
1492 | again: | 1492 | again: |
1493 | ce = mb_cache_entry_find_first(ext4_xattr_cache, 0, | 1493 | ce = mb_cache_entry_find_first(ext4_xattr_cache, inode->i_sb->s_bdev, |
1494 | inode->i_sb->s_bdev, hash); | 1494 | hash); |
1495 | while (ce) { | 1495 | while (ce) { |
1496 | struct buffer_head *bh; | 1496 | struct buffer_head *bh; |
1497 | 1497 | ||
@@ -1515,7 +1515,7 @@ again: | |||
1515 | return bh; | 1515 | return bh; |
1516 | } | 1516 | } |
1517 | brelse(bh); | 1517 | brelse(bh); |
1518 | ce = mb_cache_entry_find_next(ce, 0, inode->i_sb->s_bdev, hash); | 1518 | ce = mb_cache_entry_find_next(ce, inode->i_sb->s_bdev, hash); |
1519 | } | 1519 | } |
1520 | return NULL; | 1520 | return NULL; |
1521 | } | 1521 | } |
@@ -1591,9 +1591,7 @@ static void ext4_xattr_rehash(struct ext4_xattr_header *header, | |||
1591 | int __init | 1591 | int __init |
1592 | init_ext4_xattr(void) | 1592 | init_ext4_xattr(void) |
1593 | { | 1593 | { |
1594 | ext4_xattr_cache = mb_cache_create("ext4_xattr", NULL, | 1594 | ext4_xattr_cache = mb_cache_create("ext4_xattr", 6); |
1595 | sizeof(struct mb_cache_entry) + | ||
1596 | sizeof(((struct mb_cache_entry *) 0)->e_indexes[0]), 1, 6); | ||
1597 | if (!ext4_xattr_cache) | 1595 | if (!ext4_xattr_cache) |
1598 | return -ENOMEM; | 1596 | return -ENOMEM; |
1599 | return 0; | 1597 | return 0; |