Merge tag 'PTR_RET-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty...

[~andy/linux] / fs / btrfs / inode.c

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 021694c081814828272ff03a8b9e1f64732a46cc..7bdc83d04d54ca36006ae54e221092f2d789ef0c 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3174,7 +3174,7 @@ int btrfs_orphan_cleanup(struct btrfs_root *root)
                found_key.type = BTRFS_INODE_ITEM_KEY;
                found_key.offset = 0;
                inode = btrfs_iget(root->fs_info->sb, &found_key, root, NULL);
-               ret = PTR_RET(inode);
+               ret = PTR_ERR_OR_ZERO(inode);
                if (ret && ret != -ESTALE)
                        goto out;