Btrfs: unify error handling of btrfs_lookup_dir_item (3cf5068f) · Commits · 戴 / test

fs/btrfs/inode.c

+5 −16

Original line number	Diff line number	Diff line
		@@ -3907,12 +3907,8 @@ static int __btrfs_unlink_inode(struct btrfs_trans_handle *trans,
		path->leave_spinning = 1;
		di = btrfs_lookup_dir_item(trans, root, path, dir_ino,
		name, name_len, -1);
		if (IS_ERR(di)) {
		ret = PTR_ERR(di);
		goto err;
		}
		if (!di) {
		ret = -ENOENT;
		if (IS_ERR_OR_NULL(di)) {
		ret = di ? PTR_ERR(di) : -ENOENT;
		goto err;
		}
		leaf = path->nodes[0];
		@@ -4072,10 +4068,7 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans,
		di = btrfs_lookup_dir_item(trans, root, path, dir_ino,
		name, name_len, -1);
		if (IS_ERR_OR_NULL(di)) {
		if (!di)
		ret = -ENOENT;
		else
		ret = PTR_ERR(di);
		ret = di ? PTR_ERR(di) : -ENOENT;
		goto out;
		}

		@@ -5467,12 +5460,8 @@ static int btrfs_inode_by_name(struct inode dir, struct dentry dentry,

		di = btrfs_lookup_dir_item(NULL, root, path, btrfs_ino(BTRFS_I(dir)),
		name, namelen, 0);
		if (!di) {
		ret = -ENOENT;
		goto out;
		}
		if (IS_ERR(di)) {
		ret = PTR_ERR(di);
		if (IS_ERR_OR_NULL(di)) {
		ret = di ? PTR_ERR(di) : -ENOENT;
		goto out;
		}

+2 −6

Original line number	Diff line number	Diff line
		@@ -1693,12 +1693,8 @@ static int lookup_dir_item_inode(struct btrfs_root *root,

		di = btrfs_lookup_dir_item(NULL, root, path,
		dir, name, name_len, 0);
		if (!di) {
		ret = -ENOENT;
		goto out;
		}
		if (IS_ERR(di)) {
		ret = PTR_ERR(di);
		if (IS_ERR_OR_NULL(di)) {
		ret = di ? PTR_ERR(di) : -ENOENT;
		goto out;
		}
		btrfs_dir_item_key_to_cpu(path->nodes[0], di, &key);