diff options
| -rw-r--r-- | fs/jfs/xattr.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c index c60f3d32ee91..a6797986b625 100644 --- a/fs/jfs/xattr.c +++ b/fs/jfs/xattr.c | |||
| @@ -491,15 +491,17 @@ static int ea_get(struct inode *inode, struct ea_buffer *ea_buf, int min_size) | |||
| 491 | if (size > PSIZE) { | 491 | if (size > PSIZE) { |
| 492 | /* | 492 | /* |
| 493 | * To keep the rest of the code simple. Allocate a | 493 | * To keep the rest of the code simple. Allocate a |
| 494 | * contiguous buffer to work with | 494 | * contiguous buffer to work with. Make the buffer large |
| 495 | * enough to make use of the whole extent. | ||
| 495 | */ | 496 | */ |
| 496 | ea_buf->xattr = kmalloc(size, GFP_KERNEL); | 497 | ea_buf->max_size = (size + sb->s_blocksize - 1) & |
| 498 | ~(sb->s_blocksize - 1); | ||
| 499 | |||
| 500 | ea_buf->xattr = kmalloc(ea_buf->max_size, GFP_KERNEL); | ||
| 497 | if (ea_buf->xattr == NULL) | 501 | if (ea_buf->xattr == NULL) |
| 498 | return -ENOMEM; | 502 | return -ENOMEM; |
| 499 | 503 | ||
| 500 | ea_buf->flag = EA_MALLOC; | 504 | ea_buf->flag = EA_MALLOC; |
| 501 | ea_buf->max_size = (size + sb->s_blocksize - 1) & | ||
| 502 | ~(sb->s_blocksize - 1); | ||
| 503 | 505 | ||
| 504 | if (ea_size == 0) | 506 | if (ea_size == 0) |
| 505 | return 0; | 507 | return 0; |
