tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

btrfs: Make btrfs_del_inode_ref take btrfs_inode

Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>

authored by

Nikolay Borisov and committed by
David Sterba a491abb2 49f34d1f

+7 -7
+1 -1
fs/btrfs/inode.c
··· 4053 4053 } 4054 4054 4055 4055 ret = btrfs_del_inode_ref_in_log(trans, root, name, name_len, 4056 - inode, dir_ino); 4056 + BTRFS_I(inode), dir_ino); 4057 4057 if (ret != 0 && ret != -ENOENT) { 4058 4058 btrfs_abort_transaction(trans, ret); 4059 4059 goto err;
+5 -5
fs/btrfs/tree-log.c
··· 3192 3192 int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans, 3193 3193 struct btrfs_root *root, 3194 3194 const char *name, int name_len, 3195 - struct inode *inode, u64 dirid) 3195 + struct btrfs_inode *inode, u64 dirid) 3196 3196 { 3197 3197 struct btrfs_fs_info *fs_info = root->fs_info; 3198 3198 struct btrfs_root *log; 3199 3199 u64 index; 3200 3200 int ret; 3201 3201 3202 - if (BTRFS_I(inode)->logged_trans < trans->transid) 3202 + if (inode->logged_trans < trans->transid) 3203 3203 return 0; 3204 3204 3205 3205 ret = join_running_log_trans(root); 3206 3206 if (ret) 3207 3207 return 0; 3208 3208 log = root->log_root; 3209 - mutex_lock(&BTRFS_I(inode)->log_mutex); 3209 + mutex_lock(&inode->log_mutex); 3210 3210 3211 - ret = btrfs_del_inode_ref(trans, log, name, name_len, btrfs_ino(BTRFS_I(inode)), 3211 + ret = btrfs_del_inode_ref(trans, log, name, name_len, btrfs_ino(inode), 3212 3212 dirid, &index); 3213 - mutex_unlock(&BTRFS_I(inode)->log_mutex); 3213 + mutex_unlock(&inode->log_mutex); 3214 3214 if (ret == -ENOSPC) { 3215 3215 btrfs_set_log_full_commit(fs_info, trans); 3216 3216 ret = 0;
+1 -1
fs/btrfs/tree-log.h
··· 76 76 int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans, 77 77 struct btrfs_root *root, 78 78 const char *name, int name_len, 79 - struct inode *inode, u64 dirid); 79 + struct btrfs_inode *inode, u64 dirid); 80 80 void btrfs_end_log_trans(struct btrfs_root *root); 81 81 int btrfs_pin_log_trans(struct btrfs_root *root); 82 82 void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans,