diff options
| author | Chris Mason <chris.mason@oracle.com> | 2012-02-20 08:40:56 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-02-23 10:43:45 -0500 |
| commit | fe66a05a06795bd3b788404d69ea7709f46a1609 (patch) | |
| tree | 8d576c0c69ef44a253370bbec135efe2477d18d2 /fs/btrfs/transaction.c | |
| parent | 692e5759a43b916f0b66bcb39b2957499992381e (diff) | |
| download | op-kernel-dev-fe66a05a06795bd3b788404d69ea7709f46a1609.zip op-kernel-dev-fe66a05a06795bd3b788404d69ea7709f46a1609.tar.gz | |
Btrfs: improve error handling for btrfs_insert_dir_item callers
This allows us to gracefully continue if we aren't able to insert
directory items, both for normal files/dirs and snapshots.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 287a672..016977b 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -915,7 +915,11 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, dentry->d_name.name, dentry->d_name.len, parent_inode, &key, BTRFS_FT_DIR, index); - BUG_ON(ret); + if (ret) { + pending->error = -EEXIST; + dput(parent); + goto fail; + } btrfs_i_size_write(parent_inode, parent_inode->i_size + dentry->d_name.len * 2); @@ -993,12 +997,9 @@ static noinline int create_pending_snapshots(struct btrfs_trans_handle *trans, { struct btrfs_pending_snapshot *pending; struct list_head *head = &trans->transaction->pending_snapshots; - int ret; - list_for_each_entry(pending, head, list) { - ret = create_pending_snapshot(trans, fs_info, pending); - BUG_ON(ret); - } + list_for_each_entry(pending, head, list) + create_pending_snapshot(trans, fs_info, pending); return 0; } |
