lkml.org 
[lkml]   [2004]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: sysfs backing store error path confusion
On Fri, Nov 05, 2004 at 01:49:34AM -0600, Milton Miller wrote:
>
> On Nov 3, 2004, at 3:42 PM, Greg KH wrote:
>
> |On Tue, Nov 02, 2004 at 10:03:34AM -0600, Maneesh Soni wrote:
> ||On Tue, Nov 02, 2004 at 02:46:58AM -0600, Milton Miller wrote:
> |||sysfs_new_dirent returns ERR_PTR(-ENOMEM) if kmalloc fails but the callers
> |||were expecting NULL.
> ||
> ||Thanks for spotting this. But as you said, I will prefer to change the callee.
> ||How about this patch?
> ..
> ||- return -ENOMEM;
> ||+ return NULL;
> |
> |Actually, this needs to be a 0, not NULL, otherwise the compiler
> |complains with a warning. I've fixed it up and applied it.
> |
> |thanks,
> |
> |greg k-h
>
> I wondered why greg thought the type was wrong. After it was merged I
> realized that the wrong function was changed. Here's an attempt to fix
> both errors.
>

Yes, it is correct now. Sorry about the confusion. I edited at the wrong
palce.

Thanks
Maneesh

>
> ===== fs/sysfs/dir.c 1.27 vs edited =====
> --- 1.27/fs/sysfs/dir.c 2004-11-04 22:37:32 +01:00
> +++ edited/fs/sysfs/dir.c 2004-11-05 08:10:54 +01:00
> @@ -38,7 +38,7 @@ static struct sysfs_dirent * sysfs_new_d
>
> sd = kmalloc(sizeof(*sd), GFP_KERNEL);
> if (!sd)
> - return ERR_PTR(-ENOMEM);
> + return NULL;
>
> memset(sd, 0, sizeof(*sd));
> atomic_set(&sd->s_count, 1);
> @@ -56,7 +56,7 @@ int sysfs_make_dirent(struct sysfs_diren
>
> sd = sysfs_new_dirent(parent_sd, element);
> if (!sd)
> - return 0;
> + return -ENOMEM;
>
> sd->s_mode = mode;
> sd->s_type = type;
>

--
Maneesh Soni
Linux Technology Center,
IBM Austin
email: maneesh@in.ibm.com
Phone: 1-512-838-1896 Fax:
T/L : 6781896
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:07    [W:0.050 / U:0.224 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site