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