mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-08-15 11:46:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

scoutfs: add full lock arg to _item_update()

Browse Source 
Add the full lock arg to _item_update() so that it can verify lock
coverage.

Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
2017-10-09 15:31:29 -07:00
committed by Mark Fasheh
parent 0aa16f5ef6
commit 6cd64f3228
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kmod/src/data.c
+6 -7
View File
@@ -382,7 +382,7 @@ static int set_segno_free(struct super_block *sb, u64 segno)
goto out;
}
ret = scoutfs_item_update(sb, &key, val, lock->end);
ret = scoutfs_item_update(sb, &key, val, lock);
out:
trace_scoutfs_data_set_segno_free(sb, segno, be64_to_cpu(fbk.base),
bit, ret);
@@ -469,7 +469,7 @@ static int clear_segno_free(struct super_block *sb, u64 segno)
if (bitmap_empty((long *)frb.bits, SCOUTFS_FREE_BITS_BITS))
ret = scoutfs_item_delete(sb, &key, lock->end);
else
ret = scoutfs_item_update(sb, &key, val, lock->end);
ret = scoutfs_item_update(sb, &key, val, lock);
if (ret)
scoutfs_item_delete_dirty(sb, &b_key);
out:
@@ -518,7 +518,7 @@ static int set_blkno_free(struct super_block *sb, u64 blkno)
}
if (!bitmap_full((long *)frb.bits, SCOUTFS_FREE_BITS_BITS)) {
ret = scoutfs_item_update(sb, &key, val, lock->end);
ret = scoutfs_item_update(sb, &key, val, lock);
goto out;
}
@@ -578,7 +578,7 @@ static int clear_blkno_free(struct super_block *sb, u64 blkno)
if (bitmap_empty((long *)frb.bits, SCOUTFS_FREE_BITS_BITS))
ret = scoutfs_item_delete(sb, &key, lock->end);
else
ret = scoutfs_item_update(sb, &key, val, lock->end);
ret = scoutfs_item_update(sb, &key, val, lock);
out:
return ret;
}
@@ -675,8 +675,7 @@ int scoutfs_data_truncate_items(struct super_block *sb, u64 ino, u64 iblock,
if (!dirtied) {
/* dirty item with full size encoded */
ret = scoutfs_item_update(sb, &key, val,
lock->end);
ret = scoutfs_item_update(sb, &key, val, lock);
if (ret)
break;
dirtied = true;
@@ -960,7 +959,7 @@ static int find_alloc_block(struct super_block *sb, struct block_mapping *map,
/* ensure that we can copy in encoded without failing */
scoutfs_kvec_init(val, map->encoded, sizeof(map->encoded));
if (map_exists)
ret = scoutfs_item_update(sb, map_key, val, data_lock->end);
ret = scoutfs_item_update(sb, map_key, val, data_lock);
else
ret = scoutfs_item_create(sb, map_key, val, data_lock);
if (ret)
kmod/src/inode.c
+1 -1
View File
@@ -736,7 +736,7 @@ void scoutfs_update_inode_item(struct inode *inode, struct scoutfs_lock *lock,
scoutfs_inode_init_key(&key, &ikey, ino);
scoutfs_kvec_init(val, &sinode, sizeof(sinode));
err = scoutfs_item_update(sb, &key, val, lock->end);
err = scoutfs_item_update(sb, &key, val, lock);
if (err) {
scoutfs_err(sb, "inode %llu update err %d", ino, err);
BUG_ON(err);
kmod/src/item.c
+5 -2
View File
@@ -1382,7 +1382,7 @@ int scoutfs_item_dirty(struct super_block *sb, struct scoutfs_key_buf *key,
* Returns -ENOENT if the item doesn't exist.
*/
int scoutfs_item_update(struct super_block *sb, struct scoutfs_key_buf *key,
struct kvec *val, struct scoutfs_key_buf *end)
struct kvec *val, struct scoutfs_lock *lock)
{
struct scoutfs_sb_info *sbi = SCOUTFS_SB(sb);
struct item_cache *cac = sbi->item_cache;
@@ -1394,6 +1394,9 @@ int scoutfs_item_update(struct super_block *sb, struct scoutfs_key_buf *key,
if (invalid_key_val(key, val))
return -EINVAL;
if (WARN_ON_ONCE(!lock_coverage(lock, key, WRITE)))
return -EINVAL;
if (val) {
ret = scoutfs_kvec_dup_flatten(up_val, val);
if (ret)
@@ -1420,7 +1423,7 @@ int scoutfs_item_update(struct super_block *sb, struct scoutfs_key_buf *key,
spin_unlock_irqrestore(&cac->lock, flags);
} while (ret == -ENODATA &&
(ret = scoutfs_manifest_read_items(sb, key, end)) == 0);
(ret = scoutfs_manifest_read_items(sb, key, lock->end)) == 0);
out:
scoutfs_kvec_kfree(up_val);
kmod/src/item.h
+1 -1
View File
@@ -33,7 +33,7 @@ int scoutfs_item_create(struct super_block *sb, struct scoutfs_key_buf *key,
int scoutfs_item_dirty(struct super_block *sb, struct scoutfs_key_buf *key,
struct scoutfs_lock *lock);
int scoutfs_item_update(struct super_block *sb, struct scoutfs_key_buf *key,
struct kvec *val, struct scoutfs_key_buf *end);
struct kvec *val, struct scoutfs_lock *lock);
void scoutfs_item_delete_dirty(struct super_block *sb,
struct scoutfs_key_buf *key);
void scoutfs_item_update_dirty(struct super_block *sb,