diff options
author | Jan Kara <jack@suse.cz> | 2008-06-24 11:43:00 +0200 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2008-06-24 11:43:00 +0200 |
commit | 19fd426a18b48a0446ba4b54ac66264916dcb7f3 (patch) | |
tree | b9e0f2bc35e746c14f5e5e5519ed79f1eb4b0f98 /fs/nfs/write.c | |
parent | e8183c2452041326c95258ecc7865b6fcd91c730 (diff) | |
parent | 62786b9e81a2dbe9c073a2ade52d33a2627d6d85 (diff) | |
download | op-kernel-dev-19fd426a18b48a0446ba4b54ac66264916dcb7f3.zip op-kernel-dev-19fd426a18b48a0446ba4b54ac66264916dcb7f3.tar.gz |
Merge branch 'master' into for_mm
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 6d8ace3..f333848 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; } |