summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhong jiang <zhongjiang@huawei.com>2018-08-16 12:37:15 -0400
committerDavid Sterba <dsterba@suse.com>2018-10-15 11:23:27 -0400
commit45128b08f74131753a10a584e3e5c4496b279269 (patch)
tree55ab4d1310104c9115954a3293f8c74c868fcd32
parent556f3ca88ecb7087e7e3144e429414c60a300984 (diff)
btrfs: change btrfs_pin_log_trans to return void
btrfs_pin_log_trans defines the variable "ret" for return value, but it is not modified after initialization. Further, I find that none of the callers do handles the return value, so it is safe to drop the unneeded "ret" and make it return void. Signed-off-by: zhong jiang <zhongjiang@huawei.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--fs/btrfs/tree-log.c5
-rw-r--r--fs/btrfs/tree-log.h2
2 files changed, 2 insertions, 5 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 3c2ae0e4f25a..1078c65128c5 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -205,14 +205,11 @@ static int join_running_log_trans(struct btrfs_root *root)
205 * until you call btrfs_end_log_trans() or it makes any future 205 * until you call btrfs_end_log_trans() or it makes any future
206 * log transactions wait until you call btrfs_end_log_trans() 206 * log transactions wait until you call btrfs_end_log_trans()
207 */ 207 */
208int btrfs_pin_log_trans(struct btrfs_root *root) 208void btrfs_pin_log_trans(struct btrfs_root *root)
209{ 209{
210 int ret = -ENOENT;
211
212 mutex_lock(&root->log_mutex); 210 mutex_lock(&root->log_mutex);
213 atomic_inc(&root->log_writers); 211 atomic_inc(&root->log_writers);
214 mutex_unlock(&root->log_mutex); 212 mutex_unlock(&root->log_mutex);
215 return ret;
216} 213}
217 214
218/* 215/*
diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
index 7ab9bb88a639..767765031e59 100644
--- a/fs/btrfs/tree-log.h
+++ b/fs/btrfs/tree-log.h
@@ -65,7 +65,7 @@ int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,
65 const char *name, int name_len, 65 const char *name, int name_len,
66 struct btrfs_inode *inode, u64 dirid); 66 struct btrfs_inode *inode, u64 dirid);
67void btrfs_end_log_trans(struct btrfs_root *root); 67void btrfs_end_log_trans(struct btrfs_root *root);
68int btrfs_pin_log_trans(struct btrfs_root *root); 68void btrfs_pin_log_trans(struct btrfs_root *root);
69void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans, 69void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans,
70 struct btrfs_inode *dir, struct btrfs_inode *inode, 70 struct btrfs_inode *dir, struct btrfs_inode *inode,
71 int for_rename); 71 int for_rename);