Btrfs: fix dentry->d_parent abuses V2
PATCH 1/1 Btrfs: fix dentry->d_parent abuses V2
There are lots of places where we do dentry->d_parent->d_inode without holding the dentry->d_lock. This could cause problems with rename. So instead use dget_parent where we can, or in some cases we don't even need to use dentry->d_parent->d_inode since we get the inode of the dir passed to us from VFS. I tested this with xfstests and my no space tests and everything turned out fine. Thanks,
Signed-off-by Josef Bacik <[email protected]>
---V1->V2: return an error if btrfs_start_transaction fails in aio_write -hold the dentry->d_parent ref while using its inode in create_subvol and create_pending_snapshots
fs/btrfs/file.c | 7 +++++++ fs/btrfs/inode.c | 48 ++++++++++++++++++++++++------------------------ fs/btrfs/ioctl.c | 20 ++++++++++++++++---- fs/btrfs/transaction.c | 5 ++++- fs/btrfs/tree-log.c | 22 ++++++++++++++++++---- 5 files changed, 69 insertions(+), 33 deletions(-)
fs/btrfs/file.c +7 -0
@@ -1047,8 +1047,14 @@ out:if ((file->f_flags &O_DSYNC ) ||IS_SYNC (inode)) { trans =btrfs_start_transaction (root,0 ); +if (IS_ERR (trans)) { + num_written =PTR_ERR (trans); + goto done; + } +mutex_lock (&inode->i_mutex); ret =btrfs_log_dentry_safe (trans, root, file->f_dentry); +mutex_unlock (&inode->i_mutex);if (ret ==0 ) { ret =btrfs_sync_log (trans, root);if (ret ==0 )
@@ -1067,6 +1073,7 @@ out: (start_pos + num_written - 1) >> PAGE_CACHE_SHIFT); } } +done: current->backing_dev_info =NULL ;return num_written ? num_written : err; }
fs/btrfs/inode.c +24 -24
129 lines not on this page · raw message
fs/btrfs/ioctl.c +16 -4
@@ -233,17 +233,23 @@ static noinline int create_subvol(struct btrfs_root *root,struct btrfs_inode_item *inode_item;struct extent_buffer *leaf;struct btrfs_root *new_root; -struct inode *dir = dentry->d_parent->d_inode; +struct dentry *parent =dget_parent (dentry); +struct inode *dir;int ret;int err;u64 objectid;u64 new_dirid =BTRFS_FIRST_FREE_OBJECTID ;u64 index =0 ; + dir = parent->d_inode; + ret =btrfs_find_free_objectid (NULL , root->fs_info->tree_root,0 , &objectid); -if (ret) +if (ret) { +dput (parent);return ret; + } +/* * 1 - inode item * 2 - refs
@@ -251,8 +257,10 @@ static noinline int create_subvol(struct btrfs_root *root,* 2 - dir items */ trans =btrfs_start_transaction (root,6 ); -if (IS_ERR (trans)) +if (IS_ERR (trans)) { +dput (parent);return PTR_ERR (trans); + } leaf =btrfs_alloc_free_block (trans, root, root->leafsize,0 , objectid,NULL ,0 ,0 ,0 );
@@ -339,6 +347,7 @@ static noinline int create_subvol(struct btrfs_root *root,d_instantiate (dentry,btrfs_lookup_dentry (dir, dentry)); fail: +dput (parent);if (async_transid) { *async_transid = trans->transid; err =btrfs_commit_transaction_async (trans, root,1 );
@@ -354,6 +363,7 @@ static int create_snapshot(struct btrfs_root *root, struct dentry *dentry, char *name, int namelen, u64 *async_transid) { struct inode *inode; +struct dentry *parent;struct btrfs_pending_snapshot *pending_snapshot;struct btrfs_trans_handle *trans;int ret;
@@ -396,7 +406,9 @@ static int create_snapshot(struct btrfs_root *root, struct dentry *dentry,btrfs_orphan_cleanup (pending_snapshot->snap); - inode =btrfs_lookup_dentry (dentry->d_parent->d_inode, dentry); + parent =dget_parent (dentry); + inode =btrfs_lookup_dentry (parent->d_inode, dentry); +dput (parent);if (IS_ERR (inode)) { ret =PTR_ERR (inode); goto fail;
fs/btrfs/transaction.c +4 -1
@@ -902,6 +902,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,struct btrfs_root *root = pending->root;struct btrfs_root *parent_root;struct inode *parent_inode; +struct dentry *parent_dentry;struct dentry *dentry;struct extent_buffer *tmp;struct extent_buffer *old;
@@ -941,7 +942,8 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, trans->block_rsv = &pending->block_rsv; dentry = pending->dentry; - parent_inode = dentry->d_parent->d_inode; + parent_dentry =dget_parent (dentry); + parent_inode = parent_dentry->d_inode; parent_root =BTRFS_I (parent_inode)->root;record_root_in_trans (trans, parent_root);
@@ -989,6 +991,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, parent_inode->i_ino, index, dentry->d_name.name, dentry->d_name.len);BUG_ON (ret); +dput (parent_dentry); key.offset = (u64)-1 ; pending->snap =btrfs_read_fs_root_no_name (root->fs_info, &key);
fs/btrfs/tree-log.c +18 -4
@@ -2869,6 +2869,7 @@ static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans, {int ret =0 ;struct btrfs_root *root; +struct dentry *old_parent =NULL ;/* * for regular files, if its inode is already on disk, we don't
@@ -2910,10 +2911,13 @@ static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans,if (IS_ROOT (parent))break ; - parent = parent->d_parent; + parent =dget_parent (parent); +dput (old_parent); + old_parent = parent; inode = parent->d_inode; } +dput (old_parent); out:return ret; }
@@ -2945,6 +2949,7 @@ int btrfs_log_inode_parent(struct btrfs_trans_handle *trans, {int inode_only = exists_only ?LOG_INODE_EXISTS :LOG_INODE_ALL ;struct super_block *sb; +struct dentry *old_parent =NULL ;int ret =0 ;u64 last_committed = root->fs_info->last_trans_committed;
@@ -3016,10 +3021,13 @@ int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,if (IS_ROOT (parent))break ; - parent = parent->d_parent; + parent =dget_parent (parent); +dput (old_parent); + old_parent = parent; } ret =0 ; end_trans: +dput (old_parent);if (ret <0 ) {BUG_ON (ret != -ENOSPC ); root->fs_info->last_trans_log_full_commit = trans->transid;
@@ -3039,8 +3047,14 @@ end_no_trans:int btrfs_log_dentry_safe (struct btrfs_trans_handle *trans,struct btrfs_root *root,struct dentry *dentry) { -return btrfs_log_inode_parent (trans, root, dentry->d_inode, - dentry->d_parent,0 ); +struct dentry *parent =dget_parent (dentry); +int ret; + + ret =btrfs_log_inode_parent (trans, root, dentry->d_inode, parent,0 ); + +dput (parent); + +return ret; }/*
Signature · 1 line
1.6.6.1