[illumos-gate merge]20140821release-20140821

commit 86bb58aec7165f8a0303564575c65e5a2ad58bf1
    5095 panic when adding a duplicate dbuf to dn_dbufs
commit 60a61f7adabc73a7a0cb70d200ac2a6735f4a6e8
    5092 env files don't need to define LOCKNAME by default
    5091 illumos.sh env file's LOCKNAME definition is busted
commit 5e3f545c431ec4bce3e1b52f3f81bc9befe501f2
    4989 removal of ntfsprogs and parted
commit ba3594ba9b5dd4c846c472a8d657edcb7c8109ac
    5066 remove support for non-ANSI compilation
    5068 Remove SCCSID() macro from <macros.h>
commit d8ccf998f9c944b8cf27ed840c376f9b79ebce5c
    5087 8-bit inline atomic {add,or,and} use wrong reg constraints on x86

Manifests:
	usr/src/pkg/manifests/SUNWntfsprogs.mf (torch library)
	usr/src/pkg/manifests/SUNWparted.mf (torch headers)
	usr/src/pkg/manifests/system-file-system-ntfsprogs.mf
	usr/src/pkg/manifests/system-storage-parted.mf

1 files changed, 0 insertions, 63 deletions

diff --git a/usr/src/cmd/ntfsprogs/ntfscluster.h b/usr/src/cmd/ntfsprogs/ntfscluster.h
deleted file mode 100644
index 5a3d6b3c04..0000000000
--- a/usr/src/cmd/ntfsprogs/ntfscluster.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * ntfscluster - Part of the Linux-NTFS project.
- *
- * Copyright (c) 2002-2003 Richard Russon
- *
- * This utility will locate the owner of any given sector or cluster.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS
- * distribution in the file COPYING); if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _NTFSCLUSTER_H_
-#define _NTFSCLUSTER_H_
-
-#include "types.h"
-#include "layout.h"
-
-enum action {
-	act_none,
-	act_info,
-	act_cluster,
-	act_sector,
-	act_inode,
-	act_file,
-	act_last,
-	act_error,
-};
-
-struct options {
-	char		*device;	/* Device/File to work with */
-	enum action	 action;	/* What to do */
-	int		 quiet;		/* Less output */
-	int		 verbose;	/* Extra output */
-	int		 force;		/* Override common sense */
-	char		*filename;	/* File to examine */
-	u64		 inode;		/* Inode to examine */
-	s64		 range_begin;	/* Look for objects in this range */
-	s64		 range_end;
-};
-
-struct match {
-	u64		 inum;		/* Inode number */
-	LCN		 lcn;		/* Last cluster in use */
-	ATTR_TYPES	 type;		/* Attribute type */
-	ntfschar	*name;		/* Attribute name */
-	int		 name_len;	/* Length of attribute name */
-};
-
-#endif /* _NTFSCLUSTER_H_ */
-
-