diff --git a/[refs] b/[refs] index 24c1955389fc..f62dde039f6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a9f53b3c1875bef22ad4588e818bc046ef183da +refs/heads/master: 891ba6d4a5f9e6302bb6542592d73feb4d0d3687 diff --git a/trunk/fs/gfs2/ops_address.c b/trunk/fs/gfs2/ops_address.c index 4002f417dc19..873a511ef2be 100644 --- a/trunk/fs/gfs2/ops_address.c +++ b/trunk/fs/gfs2/ops_address.c @@ -747,7 +747,7 @@ int gfs2_releasepage(struct page *page, gfp_t gfp_mask) struct gfs2_bufdata *bd; if (!page_has_buffers(page)) - goto out; + return 0; gfs2_log_lock(sdp); head = bh = page_buffers(page); @@ -787,7 +787,6 @@ int gfs2_releasepage(struct page *page, gfp_t gfp_mask) bh = bh->b_this_page; } while (bh != head); -out: return try_to_free_buffers(page); cannot_release: gfs2_log_unlock(sdp);