[pnfs] [PATCH 2/5] cleanup: fix minor bugs in nfs_readpages

[Benny Halevy]

1. use IOMODE_READ rather than FMODE_READ in call to virtual_update_layout

2. wrong variable checked for nfs_pagein_list return status

3. "ret = err;" assignment is misindented

Signed-off-by: Benny Halevy <bhalevy at panasas.com>
---
 fs/nfs/read.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index f3a6976..9714cde 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -917,7 +917,7 @@ int nfs_readpages(struct file *filp, struct address_space *mapping,
 
 				if ((err = virtual_update_layout(inode, desc.ctx,
 				                                 count, offset,
-				                                 FMODE_READ)) != 0) {
+				                                 IOMODE_READ)) != 0) {
 					printk(KERN_NOTICE "%s: failed to get the layout!"
 				               " %Zd@%llu error=%d\n",
 					       __FUNCTION__, count, (u64)offset, err);
@@ -926,9 +926,9 @@ int nfs_readpages(struct file *filp, struct address_space *mapping,
 			}
 		#endif
 		err = nfs_pagein_list(&head, inode);
-		if (!ret)
+		if (!err)
 			nfs_add_stats(inode, NFSIOS_READPAGES, err);
-			ret = err;
+		ret = err;
 	}
 	put_nfs_open_context(desc.ctx);
 	return ret;
-- 
1.5.2.5