diff --git a/[refs] b/[refs] index fc50f2d5aee2..326c9fa6f870 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e990021bfc65b1a3778479a9e6b4811f9c1ff0e +refs/heads/master: 7011774db8afca43be466f0f0428434a9edf053e diff --git a/trunk/fs/gfs2/ops_address.c b/trunk/fs/gfs2/ops_address.c index 8d5963c7e123..015640b3f123 100644 --- a/trunk/fs/gfs2/ops_address.c +++ b/trunk/fs/gfs2/ops_address.c @@ -337,13 +337,6 @@ static int gfs2_readpages(struct file *file, struct address_space *mapping, out_noerror: ret = 0; out_unlock: - /* unlock all pages, we can't do any I/O right now */ - for (page_idx = 0; page_idx < nr_pages; page_idx++) { - struct page *page = list_entry(pages->prev, struct page, lru); - list_del(&page->lru); - unlock_page(page); - page_cache_release(page); - } if (do_unlock) gfs2_holder_uninit(&gh); goto out;