diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-06-14 14:54:57 +0400 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-06-14 14:54:57 +0400 |
| commit | 575f552012ec0cd6591fd85ee996d5a5ad1a669a (patch) | |
| tree | 86b9882f04e75e2fb1046f9c82f8c82c86810c80 /fs/btrfs/ioctl.c | |
| parent | 29cb48594b873f6193d6327097e504bd3e2314de (diff) | |
| parent | dc66c74de6f4238020db3e2041d4aca5c5b3e9bc (diff) | |
| download | linux-575f552012ec0cd6591fd85ee996d5a5ad1a669a.tar.xz | |
Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 4cdb98cf26de..4dbaf89b1337 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -1280,7 +1280,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file, trans = btrfs_start_transaction(root, 0); if (IS_ERR(trans)) { err = PTR_ERR(trans); - goto out; + goto out_up_write; } trans->block_rsv = &root->fs_info->global_block_rsv; @@ -1845,7 +1845,7 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp) dir_id = btrfs_super_root_dir(&root->fs_info->super_copy); di = btrfs_lookup_dir_item(trans, root->fs_info->tree_root, path, dir_id, "default", 7, 1); - if (!di) { + if (IS_ERR_OR_NULL(di)) { btrfs_free_path(path); btrfs_end_transaction(trans, root); printk(KERN_ERR "Umm, you don't have the default dir item, " |