Re: [PATCH Resend] btrfs: Use PTR_ERR_OR_ZERO

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 17 February 2014 09:13, Sachin Kamat <sachin.kamat@xxxxxxxxxx> wrote:
> 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@xxxxxxxxxx>
> ---
>  fs/btrfs/root-tree.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
> index 1389b69059de..38bb47e7d6b1 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) {
> --
> 1.7.9.5
>

 Ping..

-- 
With warm regards,
Sachin
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Filesystem Development]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux