From owner-svn-src-all@FreeBSD.ORG Thu Mar 19 14:26:16 2009 Return-Path: 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 129E5106567A; Thu, 19 Mar 2009 14:26:16 +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 003018FC29; Thu, 19 Mar 2009 14:26:16 +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 n2JEQF5e064972; Thu, 19 Mar 2009 14:26:15 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2JEQFE8064971; Thu, 19 Mar 2009 14:26:15 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <200903191426.n2JEQFE8064971@svn.freebsd.org> From: Andriy Gapon Date: Thu, 19 Mar 2009 14:26:15 +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: r190059 - 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" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Mar 2009 14:26:17 -0000 Author: avg Date: Thu Mar 19 14:26:15 2009 New Revision: 190059 URL: http://svn.freebsd.org/changeset/base/190059 Log: MFC 189302: udf_readdir: do not advance offset if entry can not be uio-ed 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 14:23:17 2009 (r190058) +++ stable/7/sys/fs/udf/udf_vnops.c Thu Mar 19 14:26:15 2009 (r190059) @@ -846,11 +846,11 @@ udf_readdir(struct vop_readdir_args *a) } if (error) break; + uio->uio_offset = ds->offset + ds->off; } /* 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;