btrfs: btrfs_lookup_dir_item() can return ERR_PTR

PATCH In review Dan Carpenter 1 participant 1 message May 29, 2010

Subsystems (2)

Kernel janitors Btrfs file system

lore

Share & tools

lore

Dan Carpenter

author

2010-05-29 09:47 UTC #0 lore raw

PATCH 8/11 btrfs: btrfs_lookup_dir_item() can return ERR_PTR

btrfs_lookup_dir_item() can return either ERR_PTRs or null.

Signed-off-by Dan Carpenter <[email protected]>

fs/btrfs/ioctl.c +1 -1

index 9f9a1d9..4dbaf89 100644
@@ -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, "