* [patch] error handling of ERR_PTR() returns
@ 2009-04-07 13:38 Dan Carpenter
2009-04-07 14:34 ` Andrey Kuzmin
0 siblings, 1 reply; 3+ messages in thread
From: Dan Carpenter @ 2009-04-07 13:38 UTC (permalink / raw)
To: chris.mason; +Cc: linux-btrfs
There are a couple functions which return ERR_PTR as well as NULL. The
caller needs to handle both.
Smatch also complains about the handling of alloc_extent_map() but as far
as I can see that doesn't actually return an ERR_PTR.
Compile tested on 2.6.29.
regards,
dan carpenter
--- orig/fs/btrfs/disk-io.c 2009-04-07 16:15:36.000000000 +0300
+++ devel/fs/btrfs/disk-io.c 2009-04-07 16:23:33.000000000 +0300
@@ -123,7 +123,7 @@
spin_lock(&em_tree->lock);
em = lookup_extent_mapping(em_tree, start, len);
- if (em) {
+ if (!IS_ERR(em) && em) {
em->bdev =
BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev;
spin_unlock(&em_tree->lock);
@@ -1216,8 +1216,8 @@
int ret;
root = btrfs_read_fs_root_no_name(fs_info, location);
- if (!root)
- return NULL;
+ if (!root || IS_ERR(root))
+ return root;
if (root->in_sysfs)
return root;
@@ -1324,7 +1324,7 @@
spin_lock(&em_tree->lock);
em = lookup_extent_mapping(em_tree, offset, PAGE_CACHE_SIZE);
spin_unlock(&em_tree->lock);
- if (!em) {
+ if (!em || IS_ERR(em)) {
__unplug_io_fn(bdi, page);
return;
}
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [patch] error handling of ERR_PTR() returns
2009-04-07 13:38 [patch] error handling of ERR_PTR() returns Dan Carpenter
@ 2009-04-07 14:34 ` Andrey Kuzmin
2009-04-07 14:46 ` Jeff Mahoney
0 siblings, 1 reply; 3+ messages in thread
From: Andrey Kuzmin @ 2009-04-07 14:34 UTC (permalink / raw)
To: Dan Carpenter; +Cc: chris.mason, linux-btrfs
Since both NULL ptr and IS_ERR(ptr) are treated as error, why not
redefine IS_ERR to handle both, simplifying caller's life?
Regards,
Andrey
On Tue, Apr 7, 2009 at 5:38 PM, Dan Carpenter <error27@gmail.com> wrote=
:
> There are a couple functions which return ERR_PTR as well as NULL. =C2=
=A0The
> caller needs to handle both.
>
> Smatch also complains about the handling of alloc_extent_map() but as=
far
> as I can see that doesn't actually return an ERR_PTR.
>
> Compile tested on 2.6.29.
>
> regards,
> dan carpenter
>
> --- orig/fs/btrfs/disk-io.c =C2=A0 =C2=A0 2009-04-07 16:15:36.0000000=
00 +0300
> +++ devel/fs/btrfs/disk-io.c =C2=A0 =C2=A02009-04-07 16:23:33.0000000=
00 +0300
> @@ -123,7 +123,7 @@
>
> =C2=A0 =C2=A0 =C2=A0 =C2=A0spin_lock(&em_tree->lock);
> =C2=A0 =C2=A0 =C2=A0 =C2=A0em =3D lookup_extent_mapping(em_tree, star=
t, len);
> - =C2=A0 =C2=A0 =C2=A0 if (em) {
> + =C2=A0 =C2=A0 =C2=A0 if (!IS_ERR(em) && em) {
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0em->bdev =3D
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
=C2=A0 =C2=A0BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev;
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0spin_unlock(&e=
m_tree->lock);
> @@ -1216,8 +1216,8 @@
> =C2=A0 =C2=A0 =C2=A0 =C2=A0int ret;
>
> =C2=A0 =C2=A0 =C2=A0 =C2=A0root =3D btrfs_read_fs_root_no_name(fs_inf=
o, location);
> - =C2=A0 =C2=A0 =C2=A0 if (!root)
> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return NULL;
> + =C2=A0 =C2=A0 =C2=A0 if (!root || IS_ERR(root))
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return root;
>
> =C2=A0 =C2=A0 =C2=A0 =C2=A0if (root->in_sysfs)
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return root;
> @@ -1324,7 +1324,7 @@
> =C2=A0 =C2=A0 =C2=A0 =C2=A0spin_lock(&em_tree->lock);
> =C2=A0 =C2=A0 =C2=A0 =C2=A0em =3D lookup_extent_mapping(em_tree, offs=
et, PAGE_CACHE_SIZE);
> =C2=A0 =C2=A0 =C2=A0 =C2=A0spin_unlock(&em_tree->lock);
> - =C2=A0 =C2=A0 =C2=A0 if (!em) {
> + =C2=A0 =C2=A0 =C2=A0 if (!em || IS_ERR(em)) {
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0__unplug_io_fn=
(bdi, page);
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return;
> =C2=A0 =C2=A0 =C2=A0 =C2=A0}
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs=
" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at =C2=A0http://vger.kernel.org/majordomo-info.ht=
ml
>
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" =
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [patch] error handling of ERR_PTR() returns
2009-04-07 14:34 ` Andrey Kuzmin
@ 2009-04-07 14:46 ` Jeff Mahoney
0 siblings, 0 replies; 3+ messages in thread
From: Jeff Mahoney @ 2009-04-07 14:46 UTC (permalink / raw)
To: Andrey Kuzmin; +Cc: Dan Carpenter, chris.mason, linux-btrfs
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Andrey Kuzmin wrote:
> Since both NULL ptr and IS_ERR(ptr) are treated as error, why not
> redefine IS_ERR to handle both, simplifying caller's life?
IS_ERR is a global kernel function, and NULL isn't always an error.
- -Jeff
> On Tue, Apr 7, 2009 at 5:38 PM, Dan Carpenter <error27@gmail.com> wrote:
>> There are a couple functions which return ERR_PTR as well as NULL. The
>> caller needs to handle both.
>>
>> Smatch also complains about the handling of alloc_extent_map() but as far
>> as I can see that doesn't actually return an ERR_PTR.
>>
>> Compile tested on 2.6.29.
>>
>> regards,
>> dan carpenter
>>
>> --- orig/fs/btrfs/disk-io.c 2009-04-07 16:15:36.000000000 +0300
>> +++ devel/fs/btrfs/disk-io.c 2009-04-07 16:23:33.000000000 +0300
>> @@ -123,7 +123,7 @@
>>
>> spin_lock(&em_tree->lock);
>> em = lookup_extent_mapping(em_tree, start, len);
>> - if (em) {
>> + if (!IS_ERR(em) && em) {
>> em->bdev =
>> BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev;
>> spin_unlock(&em_tree->lock);
>> @@ -1216,8 +1216,8 @@
>> int ret;
>>
>> root = btrfs_read_fs_root_no_name(fs_info, location);
>> - if (!root)
>> - return NULL;
>> + if (!root || IS_ERR(root))
>> + return root;
>>
>> if (root->in_sysfs)
>> return root;
>> @@ -1324,7 +1324,7 @@
>> spin_lock(&em_tree->lock);
>> em = lookup_extent_mapping(em_tree, offset, PAGE_CACHE_SIZE);
>> spin_unlock(&em_tree->lock);
>> - if (!em) {
>> + if (!em || IS_ERR(em)) {
>> __unplug_io_fn(bdi, page);
>> return;
>> }
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
- --
Jeff Mahoney
SUSE Labs
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org
iEYEARECAAYFAknbZysACgkQLPWxlyuTD7K0IQCgiZSrwJWtZCG3uRDAKjEPTBeT
qX8AnjaMRgZ9mqw6icQlGNCfOeYGHvO7
=d73O
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-04-07 14:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-07 13:38 [patch] error handling of ERR_PTR() returns Dan Carpenter
2009-04-07 14:34 ` Andrey Kuzmin
2009-04-07 14:46 ` Jeff Mahoney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox