diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 13:49:39 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 13:49:39 +0100 |
| commit | 220d0b1dbf78c6417a658c96e571415552d3abac (patch) | |
| tree | 70cd3862540c38ea490e7a27c3c7acc35b680234 /fs/nfs/fscache.c | |
| parent | 474b18ccc264c472abeec50f48469b6477202699 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
| download | op-kernel-dev-220d0b1dbf78c6417a658c96e571415552d3abac.zip op-kernel-dev-220d0b1dbf78c6417a658c96e571415552d3abac.tar.gz | |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'fs/nfs/fscache.c')
| -rw-r--r-- | fs/nfs/fscache.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/nfs/fscache.c b/fs/nfs/fscache.c index 70fad69..fa58800 100644 --- a/fs/nfs/fscache.c +++ b/fs/nfs/fscache.c @@ -359,17 +359,13 @@ int nfs_fscache_release_page(struct page *page, gfp_t gfp) BUG_ON(!cookie); - if (fscache_check_page_write(cookie, page)) { - if (!(gfp & __GFP_WAIT)) - return 0; - fscache_wait_on_page_write(cookie, page); - } - if (PageFsCache(page)) { dfprintk(FSCACHE, "NFS: fscache releasepage (0x%p/0x%p/0x%p)\n", cookie, page, nfsi); - fscache_uncache_page(cookie, page); + if (!fscache_maybe_release_page(cookie, page, gfp)) + return 0; + nfs_add_fscache_stats(page->mapping->host, NFSIOS_FSCACHE_PAGES_UNCACHED, 1); } |
