diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-24 19:50:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-24 19:50:46 -0400 |
| commit | 6c75969e22ffe27df64ff7477bd35fe72bface3e (patch) | |
| tree | d5bcf7f6b7963e3c8848640bcd0fc6b850252fa8 /fs/nfs/file.c | |
| parent | c02c873c25209f971c2e10884f50d4ab61db1e23 (diff) | |
| parent | 556ae3bb32cabe483375b857dda1322384c57b65 (diff) | |
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
NFS: don't try to decode GETATTR if DELEGRETURN returned error
sunrpc: handle allocation errors from __rpc_lookup_create()
SUNRPC: Fix the return value of rpc_run_bc_task()
SUNRPC: Fix a use after free bug with the NFSv4.1 backchannel
SUNRPC: Fix a potential memory leak in auth_gss
NFS: Prevent another deadlock in nfs_release_page()
Diffstat (limited to 'fs/nfs/file.c')
| -rw-r--r-- | fs/nfs/file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index ae8d02294e46..ae0d92736531 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c | |||
| @@ -491,7 +491,8 @@ static int nfs_release_page(struct page *page, gfp_t gfp) | |||
| 491 | { | 491 | { |
| 492 | dfprintk(PAGECACHE, "NFS: release_page(%p)\n", page); | 492 | dfprintk(PAGECACHE, "NFS: release_page(%p)\n", page); |
| 493 | 493 | ||
| 494 | if (gfp & __GFP_WAIT) | 494 | /* Only do I/O if gfp is a superset of GFP_KERNEL */ |
| 495 | if ((gfp & GFP_KERNEL) == GFP_KERNEL) | ||
| 495 | nfs_wb_page(page->mapping->host, page); | 496 | nfs_wb_page(page->mapping->host, page); |
| 496 | /* If PagePrivate() is set, then the page is not freeable */ | 497 | /* If PagePrivate() is set, then the page is not freeable */ |
| 497 | if (PagePrivate(page)) | 498 | if (PagePrivate(page)) |