From owner-svn-src-projects@FreeBSD.ORG Fri Sep 2 18:52:17 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6E66C106566C; Fri, 2 Sep 2011 18:52:17 +0000 (UTC) (envelope-from mdf@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5E3D58FC08; Fri, 2 Sep 2011 18:52:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p82IqHiB011853; Fri, 2 Sep 2011 18:52:17 GMT (envelope-from mdf@svn.freebsd.org) Received: (from mdf@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p82IqH1M011851; Fri, 2 Sep 2011 18:52:17 GMT (envelope-from mdf@svn.freebsd.org) Message-Id: <201109021852.p82IqH1M011851@svn.freebsd.org> From: Matthew D Fleming Date: Fri, 2 Sep 2011 18:52:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225351 - projects/ino64/sys/ufs/ufs X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Sep 2011 18:52:17 -0000 Author: mdf Date: Fri Sep 2 18:52:17 2011 New Revision: 225351 URL: http://svn.freebsd.org/changeset/base/225351 Log: ufs: Stop mangling dirent in ufs_extattr_iterate_directory. It's meaningless after switching to new dirent format. GSoC r223159. Code by: Gleb Kurtsou. Modified: projects/ino64/sys/ufs/ufs/ufs_extattr.c Modified: projects/ino64/sys/ufs/ufs/ufs_extattr.c ============================================================================== --- projects/ino64/sys/ufs/ufs/ufs_extattr.c Fri Sep 2 18:50:44 2011 (r225350) +++ projects/ino64/sys/ufs/ufs/ufs_extattr.c Fri Sep 2 18:52:17 2011 (r225351) @@ -397,20 +397,8 @@ ufs_extattr_iterate_directory(struct ufs return (error); } - /* - * XXXRW: While in UFS, we always get DIRBLKSIZ returns from - * the directory code on success, on other file systems this - * may not be the case. For portability, we should check the - * read length on return from ufs_readdir(). - */ - edp = (struct dirent *)&dirbuf[DIRBLKSIZ]; + edp = (struct dirent *)&dirbuf[DIRBLKSIZ - auio.uio_resid]; for (dp = (struct dirent *)dirbuf; dp < edp; ) { -#if (BYTE_ORDER == LITTLE_ENDIAN) - dp->d_type = dp->d_namlen; - dp->d_namlen = 0; -#else - dp->d_type = 0; -#endif if (dp->d_reclen == 0) break; error = ufs_extattr_lookup(dvp, UE_GETDIR_LOCKPARENT,