diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-23 02:53:23 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-23 02:53:23 -0400 |
| commit | acf464817d5e7be9fb67aec4027dbee0ac9be17a (patch) | |
| tree | 39fd061c0a91a11d3ae4ff19b7fe179325e39bbf /fs/nfs/write.c | |
| parent | 80d267f9aee6f1b5df602b5a19fb7b4923f17db2 (diff) | |
| parent | 8962cadbe7cbc4ed0fff94f56ebab505a10afd2e (diff) | |
Merge branch 'merge' into powerpc-next
Diffstat (limited to 'fs/nfs/write.c')
| -rw-r--r-- | fs/nfs/write.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 1ade11d1ba07..6d8ace3e3259 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
| @@ -415,7 +415,7 @@ nfs_dirty_request(struct nfs_page *req) | |||
| 415 | 415 | ||
| 416 | if (page == NULL || test_bit(PG_NEED_COMMIT, &req->wb_flags)) | 416 | if (page == NULL || test_bit(PG_NEED_COMMIT, &req->wb_flags)) |
| 417 | return 0; | 417 | return 0; |
| 418 | return !PageWriteback(req->wb_page); | 418 | return !PageWriteback(page); |
| 419 | } | 419 | } |
| 420 | 420 | ||
| 421 | #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4) | 421 | #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4) |