From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.netapp.com ([216.240.18.37]:39506 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751369Ab0KUTVq (ORCPT ); Sun, 21 Nov 2010 14:21:46 -0500 From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 5/8] NFS: Fix the error handling in "uncached_readdir()" Date: Sun, 21 Nov 2010 14:21:19 -0500 Message-Id: <1290367282-5445-5-git-send-email-Trond.Myklebust@netapp.com> In-Reply-To: <1290367282-5445-4-git-send-email-Trond.Myklebust@netapp.com> References: <1290367282-5445-1-git-send-email-Trond.Myklebust@netapp.com> <1290367282-5445-2-git-send-email-Trond.Myklebust@netapp.com> <1290367282-5445-3-git-send-email-Trond.Myklebust@netapp.com> <1290367282-5445-4-git-send-email-Trond.Myklebust@netapp.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: Content-Type: text/plain MIME-Version: 1.0 Currently, uncached_readdir() is broken because if fails to handle the results from nfs_readdir_xdr_to_array() correctly. Signed-off-by: Trond Myklebust --- fs/nfs/dir.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 353f47c..2492bac 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -766,10 +766,9 @@ int uncached_readdir(nfs_readdir_descriptor_t *desc, void *dirent, desc->page_index = 0; desc->page = page; - if (nfs_readdir_xdr_to_array(desc, page, inode) == -1) { - status = -EIO; + status = nfs_readdir_xdr_to_array(desc, page, inode); + if (status < 0) goto out_release; - } status = nfs_do_filldir(desc, dirent, filldir); -- 1.7.3.2