diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-23 16:25:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-23 16:25:11 -0700 |
| commit | 62786b9e81a2dbe9c073a2ade52d33a2627d6d85 (patch) | |
| tree | ed78a50e92a5cb5d2d792a510b769427bab3191c /fs/nfs/write.c | |
| parent | 27f4837cbfd87126e733d098824544b6841a4eb8 (diff) | |
| parent | 03fa9e84e5dc10aeacb0e4eb2f708cd9fc36a5b8 (diff) | |
| download | kernel-crypto-62786b9e81a2dbe9c073a2ade52d33a2627d6d85.tar.gz kernel-crypto-62786b9e81a2dbe9c073a2ade52d33a2627d6d85.tar.xz kernel-crypto-62786b9e81a2dbe9c073a2ade52d33a2627d6d85.zip | |
Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
NFS: nfs_updatepage(): don't mark page as dirty if an error occurred
NFS: Fix filehandle size comparisons in the mount code
NFS: Reduce the NFS mount code stack usage.
Diffstat (limited to 'fs/nfs/write.c')
| -rw-r--r-- | fs/nfs/write.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 6d8ace3e325..f333848fd3b 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -739,12 +739,13 @@ int nfs_updatepage(struct file *file, struct page *page, } status = nfs_writepage_setup(ctx, page, offset, count); - __set_page_dirty_nobuffers(page); + if (status < 0) + nfs_set_pageerror(page); + else + __set_page_dirty_nobuffers(page); dprintk("NFS: nfs_updatepage returns %d (isize %Ld)\n", status, (long long)i_size_read(inode)); - if (status < 0) - nfs_set_pageerror(page); return status; } |