From dd99a0127e192329537786a497b8a160d09f0497 Mon Sep 17 00:00:00 2001 From: Mark Fasheh Date: Mon, 16 Oct 2017 18:14:48 -0500 Subject: [PATCH] scoutfs: rename scoutfs_inode_index_lock_hold Call it scoutfs_inode_index_try_lock_hold since it may fail and unwind as part of normal (not an error) operation. This lets us re-use the name in an upcoming patch. Signed-off-by: Mark Fasheh --- kmod/src/data.c | 5 +++-- kmod/src/dir.c | 12 ++++++------ kmod/src/inode.c | 10 +++++----- kmod/src/inode.h | 6 +++--- kmod/src/xattr.c | 4 ++-- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/kmod/src/data.c b/kmod/src/data.c index 4c8b88bb..23a98eff 100644 --- a/kmod/src/data.c +++ b/kmod/src/data.c @@ -1179,8 +1179,9 @@ static int scoutfs_write_begin(struct file *file, ret = scoutfs_inode_index_start(sb, &ind_seq) ?: scoutfs_inode_index_prepare(sb, &wbd->ind_locks, inode, new_size, true) ?: - scoutfs_inode_index_lock_hold(sb, &wbd->ind_locks, - ind_seq, SIC_WRITE_BEGIN()); + scoutfs_inode_index_try_lock_hold(sb, &wbd->ind_locks, + ind_seq, + SIC_WRITE_BEGIN()); } while (ret > 0); if (ret < 0) goto out; diff --git a/kmod/src/dir.c b/kmod/src/dir.c index 0813eec0..5c8a7d13 100644 --- a/kmod/src/dir.c +++ b/kmod/src/dir.c @@ -576,7 +576,7 @@ retry: scoutfs_inode_index_prepare(sb, ind_locks, dir, dir_size, true) ?: scoutfs_inode_index_prepare_ino(sb, ind_locks, ino, mode, inode_size) ?: - scoutfs_inode_index_lock_hold(sb, ind_locks, ind_seq, cnt); + scoutfs_inode_index_try_lock_hold(sb, ind_locks, ind_seq, cnt); if (ret > 0) goto retry; if (ret) @@ -715,8 +715,8 @@ retry: dir_size, false) ?: scoutfs_inode_index_prepare(sb, &ind_locks, inode, i_size_read(inode), false) ?: - scoutfs_inode_index_lock_hold(sb, &ind_locks, ind_seq, - SIC_LINK(dentry->d_name.len)); + scoutfs_inode_index_try_lock_hold(sb, &ind_locks, ind_seq, + SIC_LINK(dentry->d_name.len)); if (ret > 0) goto retry; if (ret) @@ -799,8 +799,8 @@ retry: dir_size, false) ?: scoutfs_inode_index_prepare(sb, &ind_locks, inode, i_size_read(inode), false) ?: - scoutfs_inode_index_lock_hold(sb, &ind_locks, ind_seq, - SIC_UNLINK(dentry->d_name.len)); + scoutfs_inode_index_try_lock_hold(sb, &ind_locks, ind_seq, + SIC_UNLINK(dentry->d_name.len)); if (ret > 0) goto retry; if (ret) @@ -1465,7 +1465,7 @@ retry: (new_inode == NULL ? 0 : scoutfs_inode_index_prepare(sb, &ind_locks, new_inode, i_size_read(new_inode), false)) ?: - scoutfs_inode_index_lock_hold(sb, &ind_locks, ind_seq, + scoutfs_inode_index_try_lock_hold(sb, &ind_locks, ind_seq, SIC_RENAME(old_dentry->d_name.len, new_dentry->d_name.len)); if (ret > 0) diff --git a/kmod/src/inode.c b/kmod/src/inode.c index be8bbee0..095c478e 100644 --- a/kmod/src/inode.c +++ b/kmod/src/inode.c @@ -939,9 +939,9 @@ int scoutfs_inode_index_start(struct super_block *sb, u64 *seq) * * Returns > 0 if the seq changed and the locks should be retried. */ -int scoutfs_inode_index_lock_hold(struct super_block *sb, - struct list_head *list, u64 seq, - const struct scoutfs_item_count cnt) +int scoutfs_inode_index_try_lock_hold(struct super_block *sb, + struct list_head *list, u64 seq, + const struct scoutfs_item_count cnt) { struct scoutfs_sb_info *sbi = SCOUTFS_SB(sb); struct index_lock *ind_lock; @@ -1273,8 +1273,8 @@ static int delete_inode_items(struct super_block *sb, u64 ino) retry: ret = scoutfs_inode_index_start(sb, &ind_seq) ?: prepare_index_deletion(sb, &ind_locks, ino, mode, &sinode) ?: - scoutfs_inode_index_lock_hold(sb, &ind_locks, ind_seq, - SIC_DIRTY_INODE()); + scoutfs_inode_index_try_lock_hold(sb, &ind_locks, ind_seq, + SIC_DIRTY_INODE()); if (ret > 0) goto retry; if (ret) diff --git a/kmod/src/inode.h b/kmod/src/inode.h index be47ddb0..fe884f13 100644 --- a/kmod/src/inode.h +++ b/kmod/src/inode.h @@ -69,9 +69,9 @@ int scoutfs_inode_index_prepare(struct super_block *sb, struct list_head *list, int scoutfs_inode_index_prepare_ino(struct super_block *sb, struct list_head *list, u64 ino, umode_t mode, u64 new_size); -int scoutfs_inode_index_lock_hold(struct super_block *sb, - struct list_head *list, u64 seq, - const struct scoutfs_item_count cnt); +int scoutfs_inode_index_try_lock_hold(struct super_block *sb, + struct list_head *list, u64 seq, + const struct scoutfs_item_count cnt); void scoutfs_inode_index_unlock(struct super_block *sb, struct list_head *list); int scoutfs_dirty_inode_item(struct inode *inode, struct scoutfs_lock *lock); diff --git a/kmod/src/xattr.c b/kmod/src/xattr.c index 5f7a1415..d72942c9 100644 --- a/kmod/src/xattr.c +++ b/kmod/src/xattr.c @@ -322,8 +322,8 @@ retry: ret = scoutfs_inode_index_start(sb, &ind_seq) ?: scoutfs_inode_index_prepare(sb, &ind_locks, inode, i_size_read(inode), false) ?: - scoutfs_inode_index_lock_hold(sb, &ind_locks, ind_seq, - SIC_XATTR_SET(name_len, size)); + scoutfs_inode_index_try_lock_hold(sb, &ind_locks, ind_seq, + SIC_XATTR_SET(name_len, size)); if (ret > 0) goto retry; if (ret)