summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2007-12-20 14:55:04 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-01-30 02:06:02 -0500
commit3d509e5454a0a5ac88bf3191ab65d85952c1de31 (patch)
treedf690f78b818c9f8f9b062e3f9d10aa5dc4387d9
parentbf4285e75c3272ad9bfdeb886d247962bb2985f8 (diff)
downloadlinux-3.10-3d509e5454a0a5ac88bf3191ab65d85952c1de31.tar.gz
linux-3.10-3d509e5454a0a5ac88bf3191ab65d85952c1de31.tar.bz2
linux-3.10-3d509e5454a0a5ac88bf3191ab65d85952c1de31.zip
NFS: nfs_write_end clean up
Clean up: commit 4899f9c8 added nfs_write_end(), which introduces a conditional expression that returns an unsigned integer in one arm and a signed integer in the other. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/file.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 4560fc2ddb4..ef57a5ae590 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -349,7 +349,9 @@ static int nfs_write_end(struct file *file, struct address_space *mapping,
unlock_page(page);
page_cache_release(page);
- return status < 0 ? status : copied;
+ if (status < 0)
+ return status;
+ return copied;
}
static void nfs_invalidate_page(struct page *page, unsigned long offset)