svn commit: r190045 - in stable/7/sys: . fs/udf

Andriy Gapon avg at FreeBSD.org
Thu Mar 19 06:48:44 PDT 2009


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;
 


More information about the svn-src-all mailing list