Commit 886322e8 authored by Sachin Kamat's avatar Sachin Kamat Committed by Josef Bacik
Browse files

btrfs: Use PTR_ERR_OR_ZERO 



PTR_RET is deprecated. Use PTR_ERR_OR_ZERO instead. While at it
also include missing err.h header.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarJosef Bacik <jbacik@fb.com>
parent bf0d1f44

fs/btrfs/root-tree.c

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 * Boston, MA 021110-1307, USA.

 */



#include <linux/err.h>

#include <linux/uuid.h>

#include "ctree.h"

#include "transaction.h"
@@ -271,7 +272,7 @@ int btrfs_find_orphan_roots(struct btrfs_root *tree_root) 
		key.offset++;



		root = btrfs_read_fs_root(tree_root, &root_key);

		err = PTR_RET(root);

		err = PTR_ERR_OR_ZERO(root);

		if (err && err != -ENOENT) {

			break;

		} else if (err == -ENOENT) {