diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2014-02-17 09:13:57 +0530 |
|---|---|---|
| committer | Josef Bacik <jbacik@fb.com> | 2014-03-10 15:16:51 -0400 |
| commit | 886322e8e787604731e782d36c34327a8970bda9 (patch) | |
| tree | 216d577ab5ec3cb64a6208e6471c50df6677fb77 | |
| parent | bf0d1f441d1679136c25e6141dd7e66cc7a14218 (diff) | |
| download | op-kernel-dev-886322e8e787604731e782d36c34327a8970bda9.zip op-kernel-dev-886322e8e787604731e782d36c34327a8970bda9.tar.gz | |
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: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Josef Bacik <jbacik@fb.com>
| -rw-r--r-- | fs/btrfs/root-tree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c index 1389b69..38bb47e 100644 --- a/fs/btrfs/root-tree.c +++ b/fs/btrfs/root-tree.c @@ -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) { |
