diff options
| author | Dave Chinner <david@fromorbit.com> | 2009-12-14 23:11:57 +0000 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2009-12-16 13:41:20 -0600 |
| commit | 3fc98b1ac036675b95f6e3fafd5ef147b97d4d30 (patch) | |
| tree | 1710b6e0140a12a6e20ef0494b11e42b9f0fcfc6 | |
| parent | a5f9be58c2b87106100a6053d09b1f9f8d551c6e (diff) | |
| download | linux-stable-3fc98b1ac036675b95f6e3fafd5ef147b97d4d30.tar.gz linux-stable-3fc98b1ac036675b95f6e3fafd5ef147b97d4d30.tar.bz2 linux-stable-3fc98b1ac036675b95f6e3fafd5ef147b97d4d30.zip | |
XFS: Free buffer pages array unconditionally
The code in xfs_free_buf() only attempts to free the b_pages array if the
buffer is a page cache backed or page allocated buffer. The extra log buffer
that is used when the log wraps uses pages that are allocated to a different
log buffer, but it still has a b_pages array allocated when those pages
are associated to with the extra buffer in xfs_buf_associate_memory.
Hence we need to always attempt to free the b_pages array when tearing
down a buffer, not just on buffers that are explicitly marked as page bearing
buffers. This fixes a leak detected by the kernel memory leak code.
Signed-off-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_buf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c index 162359b664ca..77b8be81c769 100644 --- a/fs/xfs/linux-2.6/xfs_buf.c +++ b/fs/xfs/linux-2.6/xfs_buf.c @@ -292,6 +292,7 @@ _xfs_buf_free_pages( { if (bp->b_pages != bp->b_page_array) { kmem_free(bp->b_pages); + bp->b_pages = NULL; } } @@ -323,9 +324,8 @@ xfs_buf_free( ASSERT(!PagePrivate(page)); page_cache_release(page); } - _xfs_buf_free_pages(bp); } - + _xfs_buf_free_pages(bp); xfs_buf_deallocate(bp); } |