From owner-svn-src-all@FreeBSD.ORG Thu Mar 19 13:48:43 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 84CA4106564A;
Thu, 19 Mar 2009 13:48:43 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 72A9C8FC20;
Thu, 19 Mar 2009 13:48:43 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2JDmhmP063386;
Thu, 19 Mar 2009 13:48:43 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2JDmhBE063385;
Thu, 19 Mar 2009 13:48:43 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <200903191348.n2JDmhBE063385@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Thu, 19 Mar 2009 13:48:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r190045 - in stable/7/sys: . fs/udf
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Mar 2009 13:48:44 -0000
Author: avg
Date: Thu Mar 19 13:48:43 2009
New Revision: 190045
URL: http://svn.freebsd.org/changeset/base/190045
Log:
MFC 188815, 188815: fix incorrect error return when reading a large dir
Approved by: jhb (mentor)
Modified:
stable/7/sys/ (props changed)
stable/7/sys/fs/udf/udf_vnops.c
Modified: stable/7/sys/fs/udf/udf_vnops.c
==============================================================================
--- stable/7/sys/fs/udf/udf_vnops.c Thu Mar 19 13:38:20 2009 (r190044)
+++ stable/7/sys/fs/udf/udf_vnops.c Thu Mar 19 13:48:43 2009 (r190045)
@@ -818,17 +818,16 @@ udf_readdir(struct vop_readdir_args *a)
error = udf_uiodir(&uiodir, dir.d_reclen, uio,
ds->this_off);
}
- if (error) {
- printf("uiomove returned %d\n", error);
+ if (error)
break;
- }
-
}
/* tell the calling layer whether we need to be called again */
*a->a_eofflag = uiodir.eofflag;
uio->uio_offset = ds->offset + ds->off;
+ if (error < 0)
+ error = 0;
if (!error)
error = ds->error;