[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, 100 deletions

diff --git a/usr/src/cmd/ntfsprogs/utils.h b/usr/src/cmd/ntfsprogs/utils.h
deleted file mode 100644
index a38f43104d..0000000000
--- a/usr/src/cmd/ntfsprogs/utils.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * utils.h - Part of the Linux-NTFS project.
- *
- * Copyright (c) 2002-2005 Richard Russon
- * Copyright (c) 2004 Anton Altaparmakov
- *
- * A set of shared functions for ntfs utilities
- *
- * 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 _NTFS_UTILS_H_
-#define _NTFS_UTILS_H_
-
-#include "config.h"
-
-#include "types.h"
-#include "layout.h"
-#include "volume.h"
-
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#ifdef HAVE_STDARG_H
-#include <stdarg.h>
-#endif
-
-extern const char *ntfs_bugs;
-extern const char *ntfs_home;
-extern const char *ntfs_gpl;
-
-int utils_set_locale(void);
-int utils_parse_size(const char *value, s64 *size, BOOL scale);
-int utils_parse_range(const char *string, s64 *start, s64 *finish, BOOL scale);
-int utils_inode_get_name(ntfs_inode *inode, char *buffer, int bufsize);
-int utils_attr_get_name(ntfs_volume *vol, ATTR_RECORD *attr, char *buffer, int bufsize);
-int utils_cluster_in_use(ntfs_volume *vol, long long lcn);
-int utils_mftrec_in_use(ntfs_volume *vol, MFT_REF mref);
-int utils_is_metadata(ntfs_inode *inode);
-void utils_dump_mem(void *buf, int start, int length, int flags);
-
-ATTR_RECORD * find_attribute(const ATTR_TYPES type, ntfs_attr_search_ctx *ctx);
-ATTR_RECORD * find_first_attribute(const ATTR_TYPES type, MFT_RECORD *mft);
-
-int utils_valid_device(const char *name, int force);
-ntfs_volume * utils_mount_volume(const char *device, ntfs_mount_flags flags);
-
-/**
- * defines...
- * if *not in use* then the other flags are ignored?
- */
-#define FEMR_IN_USE		(1 << 0)
-#define FEMR_NOT_IN_USE		(1 << 1)
-#define FEMR_FILE		(1 << 2)		// $DATA
-#define FEMR_DIR		(1 << 3)		// $INDEX_ROOT, "$I30"
-#define FEMR_METADATA		(1 << 4)
-#define FEMR_NOT_METADATA	(1 << 5)
-#define FEMR_BASE_RECORD	(1 << 6)
-#define FEMR_NOT_BASE_RECORD	(1 << 7)
-#define FEMR_ALL_RECORDS	0xFF
-
-/**
- * struct mft_search_ctx
- */
-struct mft_search_ctx {
-	int flags_search;
-	int flags_match;
-	ntfs_inode *inode;
-	ntfs_volume *vol;
-	u64 mft_num;
-};
-
-struct mft_search_ctx * mft_get_search_ctx(ntfs_volume *vol);
-void mft_put_search_ctx(struct mft_search_ctx *ctx);
-int mft_next_record(struct mft_search_ctx *ctx);
-
-// Flags for dump mem
-#define DM_DEFAULTS	0
-#define DM_NO_ASCII	(1 << 0)
-#define DM_NO_DIVIDER	(1 << 1)
-#define DM_INDENT	(1 << 2)
-#define DM_RED		(1 << 3)
-#define DM_GREEN	(1 << 4)
-#define DM_BLUE		(1 << 5)
-#define DM_BOLD		(1 << 6)
-
-#endif /* _NTFS_UTILS_H_ */