diff options
Diffstat (limited to 'fs/gfs2/file.c')
| -rw-r--r-- | fs/gfs2/file.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index ed9a94f0ef15..4edd662c8232 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c | |||
| @@ -351,7 +351,6 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
| 351 | unsigned long last_index; | 351 | unsigned long last_index; |
| 352 | u64 pos = page->index << PAGE_CACHE_SHIFT; | 352 | u64 pos = page->index << PAGE_CACHE_SHIFT; |
| 353 | unsigned int data_blocks, ind_blocks, rblocks; | 353 | unsigned int data_blocks, ind_blocks, rblocks; |
| 354 | int alloc_required = 0; | ||
| 355 | struct gfs2_holder gh; | 354 | struct gfs2_holder gh; |
| 356 | struct gfs2_alloc *al; | 355 | struct gfs2_alloc *al; |
| 357 | int ret; | 356 | int ret; |
| @@ -364,8 +363,7 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
| 364 | set_bit(GLF_DIRTY, &ip->i_gl->gl_flags); | 363 | set_bit(GLF_DIRTY, &ip->i_gl->gl_flags); |
| 365 | set_bit(GIF_SW_PAGED, &ip->i_flags); | 364 | set_bit(GIF_SW_PAGED, &ip->i_flags); |
| 366 | 365 | ||
| 367 | ret = gfs2_write_alloc_required(ip, pos, PAGE_CACHE_SIZE, &alloc_required); | 366 | if (!gfs2_write_alloc_required(ip, pos, PAGE_CACHE_SIZE)) |
| 368 | if (ret || !alloc_required) | ||
| 369 | goto out_unlock; | 367 | goto out_unlock; |
| 370 | ret = -ENOMEM; | 368 | ret = -ENOMEM; |
| 371 | al = gfs2_alloc_get(ip); | 369 | al = gfs2_alloc_get(ip); |
