From: Chuck Lever <chuck.lever@oracle.com>
Date: Thu, 20 Dec 2007 19:55:04 +0000 (-0500)
Subject: NFS: nfs_write_end clean up
X-Git-Tag: v2.6.25-rc1~1146^2~24
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3d509e5454a0a5ac88bf3191ab65d85952c1de31;p=~emulex%2Finfiniband.git

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>
---

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)