aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cachefiles/rdwr.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/cachefiles/rdwr.c')
-rw-r--r--fs/cachefiles/rdwr.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
index c0f3da3926a0..afbdc418966d 100644
--- a/fs/cachefiles/rdwr.c
+++ b/fs/cachefiles/rdwr.c
@@ -194,10 +194,10 @@ static void cachefiles_read_copier(struct fscache_operation *_op)
194 error = -EIO; 194 error = -EIO;
195 } 195 }
196 196
197 page_cache_release(monitor->back_page); 197 put_page(monitor->back_page);
198 198
199 fscache_end_io(op, monitor->netfs_page, error); 199 fscache_end_io(op, monitor->netfs_page, error);
200 page_cache_release(monitor->netfs_page); 200 put_page(monitor->netfs_page);
201 fscache_retrieval_complete(op, 1); 201 fscache_retrieval_complete(op, 1);
202 fscache_put_retrieval(op); 202 fscache_put_retrieval(op);
203 kfree(monitor); 203 kfree(monitor);
@@ -288,8 +288,8 @@ monitor_backing_page:
288 _debug("- monitor add"); 288 _debug("- monitor add");
289 289
290 /* install the monitor */ 290 /* install the monitor */
291 page_cache_get(monitor->netfs_page); 291 get_page(monitor->netfs_page);
292 page_cache_get(backpage); 292 get_page(backpage);
293 monitor->back_page = backpage; 293 monitor->back_page = backpage;
294 monitor->monitor.private = backpage; 294 monitor->monitor.private = backpage;
295 add_page_wait_queue(backpage, &monitor->monitor); 295 add_page_wait_queue(backpage, &monitor->monitor);
@@ -310,7 +310,7 @@ backing_page_already_present:
310 _debug("- present"); 310 _debug("- present");
311 311
312 if (newpage) { 312 if (newpage) {
313 page_cache_release(newpage); 313 put_page(newpage);
314 newpage = NULL; 314 newpage = NULL;
315 } 315 }
316 316
@@ -342,7 +342,7 @@ success:
342 342
343out: 343out:
344 if (backpage) 344 if (backpage)
345 page_cache_release(backpage); 345 put_page(backpage);
346 if (monitor) { 346 if (monitor) {
347 fscache_put_retrieval(monitor->op); 347 fscache_put_retrieval(monitor->op);
348 kfree(monitor); 348 kfree(monitor);
@@ -363,7 +363,7 @@ io_error:
363 goto out; 363 goto out;
364 364
365nomem_page: 365nomem_page:
366 page_cache_release(newpage); 366 put_page(newpage);
367nomem_monitor: 367nomem_monitor:
368 fscache_put_retrieval(monitor->op); 368 fscache_put_retrieval(monitor->op);
369 kfree(monitor); 369 kfree(monitor);
@@ -530,7 +530,7 @@ static int cachefiles_read_backing_file(struct cachefiles_object *object,
530 netpage->index, cachefiles_gfp); 530 netpage->index, cachefiles_gfp);
531 if (ret < 0) { 531 if (ret < 0) {
532 if (ret == -EEXIST) { 532 if (ret == -EEXIST) {
533 page_cache_release(netpage); 533 put_page(netpage);
534 fscache_retrieval_complete(op, 1); 534 fscache_retrieval_complete(op, 1);
535 continue; 535 continue;
536 } 536 }
@@ -538,10 +538,10 @@ static int cachefiles_read_backing_file(struct cachefiles_object *object,
538 } 538 }
539 539
540 /* install a monitor */ 540 /* install a monitor */
541 page_cache_get(netpage); 541 get_page(netpage);
542 monitor->netfs_page = netpage; 542 monitor->netfs_page = netpage;
543 543
544 page_cache_get(backpage); 544 get_page(backpage);
545 monitor->back_page = backpage; 545 monitor->back_page = backpage;
546 monitor->monitor.private = backpage; 546 monitor->monitor.private = backpage;
547 add_page_wait_queue(backpage, &monitor->monitor); 547 add_page_wait_queue(backpage, &monitor->monitor);
@@ -555,10 +555,10 @@ static int cachefiles_read_backing_file(struct cachefiles_object *object,
555 unlock_page(backpage); 555 unlock_page(backpage);
556 } 556 }
557 557
558 page_cache_release(backpage); 558 put_page(backpage);
559 backpage = NULL; 559 backpage = NULL;
560 560
561 page_cache_release(netpage); 561 put_page(netpage);
562 netpage = NULL; 562 netpage = NULL;
563 continue; 563 continue;
564 564
@@ -603,7 +603,7 @@ static int cachefiles_read_backing_file(struct cachefiles_object *object,
603 netpage->index, cachefiles_gfp); 603 netpage->index, cachefiles_gfp);
604 if (ret < 0) { 604 if (ret < 0) {
605 if (ret == -EEXIST) { 605 if (ret == -EEXIST) {
606 page_cache_release(netpage); 606 put_page(netpage);
607 fscache_retrieval_complete(op, 1); 607 fscache_retrieval_complete(op, 1);
608 continue; 608 continue;
609 } 609 }
@@ -612,14 +612,14 @@ static int cachefiles_read_backing_file(struct cachefiles_object *object,
612 612
613 copy_highpage(netpage, backpage); 613 copy_highpage(netpage, backpage);
614 614
615 page_cache_release(backpage); 615 put_page(backpage);
616 backpage = NULL; 616 backpage = NULL;
617 617
618 fscache_mark_page_cached(op, netpage); 618 fscache_mark_page_cached(op, netpage);
619 619
620 /* the netpage is unlocked and marked up to date here */ 620 /* the netpage is unlocked and marked up to date here */
621 fscache_end_io(op, netpage, 0); 621 fscache_end_io(op, netpage, 0);
622 page_cache_release(netpage); 622 put_page(netpage);
623 netpage = NULL; 623 netpage = NULL;
624 fscache_retrieval_complete(op, 1); 624 fscache_retrieval_complete(op, 1);
625 continue; 625 continue;
@@ -632,11 +632,11 @@ static int cachefiles_read_backing_file(struct cachefiles_object *object,
632out: 632out:
633 /* tidy up */ 633 /* tidy up */
634 if (newpage) 634 if (newpage)
635 page_cache_release(newpage); 635 put_page(newpage);
636 if (netpage) 636 if (netpage)
637 page_cache_release(netpage); 637 put_page(netpage);
638 if (backpage) 638 if (backpage)
639 page_cache_release(backpage); 639 put_page(backpage);
640 if (monitor) { 640 if (monitor) {
641 fscache_put_retrieval(op); 641 fscache_put_retrieval(op);
642 kfree(monitor); 642 kfree(monitor);
@@ -644,7 +644,7 @@ out:
644 644
645 list_for_each_entry_safe(netpage, _n, list, lru) { 645 list_for_each_entry_safe(netpage, _n, list, lru) {
646 list_del(&netpage->lru); 646 list_del(&netpage->lru);
647 page_cache_release(netpage); 647 put_page(netpage);
648 fscache_retrieval_complete(op, 1); 648 fscache_retrieval_complete(op, 1);
649 } 649 }
650 650