[PATCH 3/8] xfs: handle kmalloc failure when reading attrs

Dave Chinner david at fromorbit.com
Fri Mar 2 03:49:38 CST 2012


On Fri, Mar 02, 2012 at 02:49:20AM -0500, Christoph Hellwig wrote:
> I think the subject should be more like:
> 
> xfs: fallback to vmalloc for large buffers in xfs_attrmulti_attr_get

OK.

> > +	kbuf = kmem_zalloc(*len, KM_SLEEP | KM_MAYFAIL);
> > +	if (!kbuf) {
> > +		kbuf = kmem_zalloc_large(*len);
> > +		if (!kbuf)
> > +			return ENOMEM;
> > +	}
> >  
> >  	error = xfs_attr_get(XFS_I(inode), name, kbuf, (int *)len, flags);
> >  	if (error)
> > @@ -457,7 +460,7 @@ xfs_attrmulti_attr_get(
> >  		error = EFAULT;
> >  
> >   out_kfree:
> > -	kfree(kbuf);
> > +	kmem_free(kbuf);
> 
> kmem_free doesn't handle vmalloced buffers from kmem_zalloc_large, you
> need to use kmem_free_large for them.

static inline void kmem_free_large(void *ptr)
{
        vfree(ptr);
}

That only handles vmalloced memory, but kmem_free()
handles both kmalloc() and vmalloc() memory:

void
kmem_free(const void *ptr)
{
        if (!is_vmalloc_addr(ptr)) {
                kfree(ptr);
        } else {
                vfree(ptr);
        }
}

Avoiding having to open code this vmalloc check is exactly why I
chose kmem_free() here ;)

Cheers,

Dave.
-- 
Dave Chinner
david at fromorbit.com



More information about the xfs mailing list