mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-09-05 23:56:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

scoutfs: add lock around data item truncation

Browse Source 
Add cluster lock coverage to scoutfs_data_truncate_items() and plumb the
lock down into the item functions.

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 55709c4345
commit 9e3954a918
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kmod/src/data.c
+5 -3
View File
@@ -599,7 +599,8 @@ out:
* partial progress.
*/
int scoutfs_data_truncate_items(struct super_block *sb, u64 ino, u64 iblock,
u64 len, bool offline)
u64 len, bool offline,
struct scoutfs_lock *lock)
{
struct scoutfs_key_buf last_key;
struct scoutfs_key_buf key;
@@ -633,7 +634,7 @@ int scoutfs_data_truncate_items(struct super_block *sb, u64 ino, u64 iblock,
init_mapping_key(&key, &bmk, ino, iblock);
scoutfs_kvec_init(val, map->encoded, sizeof(map->encoded));
ret = scoutfs_item_next(sb, &key, &last_key, val, NULL);
ret = scoutfs_item_next(sb, &key, &last_key, val, lock->end);
if (ret < 0) {
if (ret == -ENOENT)
ret = 0;
@@ -669,7 +670,8 @@ 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, NULL);
ret = scoutfs_item_update(sb, &key, val,
lock->end);
if (ret)
break;
dirtied = true;
kmod/src/data.h
+2 -1
View File
@@ -5,7 +5,8 @@ extern const struct address_space_operations scoutfs_file_aops;
extern const struct file_operations scoutfs_file_fops;
int scoutfs_data_truncate_items(struct super_block *sb, u64 ino, u64 iblock,
u64 len, bool offline);
u64 len, bool offline,
struct scoutfs_lock *lock);
int scoutfs_data_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
u64 start, u64 len);
kmod/src/ioctl.c
+8 -1
View File
@@ -331,6 +331,7 @@ static long scoutfs_ioc_release(struct file *file, unsigned long arg)
struct inode *inode = file_inode(file);
struct super_block *sb = inode->i_sb;
struct scoutfs_ioctl_release args;
struct scoutfs_lock *lock = NULL;
loff_t start;
loff_t end_inc;
int ret;
@@ -352,6 +353,11 @@ static long scoutfs_ioc_release(struct file *file, unsigned long arg)
mutex_lock(&inode->i_mutex);
ret = scoutfs_lock_inode(sb, DLM_LOCK_EX, SCOUTFS_LKF_REFRESH_INODE,
inode, &lock);
if (ret)
goto out;
if (!S_ISREG(inode->i_mode)) {
ret = -EINVAL;
goto out;
@@ -375,8 +381,9 @@ static long scoutfs_ioc_release(struct file *file, unsigned long arg)
truncate_inode_pages_range(&inode->i_data, start, end_inc);
ret = scoutfs_data_truncate_items(sb, scoutfs_ino(inode), args.block,
args.count, true);
args.count, true, lock);
out:
scoutfs_unlock(sb, lock, DLM_LOCK_EX);
mutex_unlock(&inode->i_mutex);
mnt_drop_write_file(file);