diff options
| author |   Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-24 22:29:46 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-24 22:29:46 -0700 |
| commit | 62250b3bb596ffbae17c4b3d865fecd6329ce8b3 (patch) | |
| tree | 8f18da918c319a1f0be6c4011b60091bb29dc007 /fs/nfs/file.c | |
| parent | Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 (diff) | |
| parent | VFS: Remove redundant open-coded mode bit checks in open_exec(). (diff) | |
| download | linux-dev-62250b3bb596ffbae17c4b3d865fecd6329ce8b3.tar.xz linux-dev-62250b3bb596ffbae17c4b3d865fecd6329ce8b3.zip | |
Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6
Diffstat (limited to 'fs/nfs/file.c')
| -rw-r--r-- | fs/nfs/file.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index cc2b874ad5a4..48e892880d5b 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -312,7 +312,13 @@ static void nfs_invalidate_page(struct page *page, unsigned long offset) static int nfs_release_page(struct page *page, gfp_t gfp) { - return !nfs_wb_page(page->mapping->host, page); + if (gfp & __GFP_FS) + return !nfs_wb_page(page->mapping->host, page); + else + /* + * Avoid deadlock on nfs_wait_on_request(). + */ + return 0; } const struct address_space_operations nfs_file_aops = { |