⛏️ index : haiku.git

author Stephan Aßmus <superstippi@gmx.de> 2009-08-31 15:07:58.0 +00:00:00
committer Stephan Aßmus <superstippi@gmx.de> 2009-08-31 15:07:58.0 +00:00:00
commit 
83ea27ff9cace75ba5332b00a26c7cb9af6433c8 [patch]
tree 
5f1d9a5a2b45bd1f1104900e8b75a5c280292ed1
parent 
6b89e72bcb00789dff8ee8ce2334d6c91549c8ab
download 
83ea27ff9cace75ba5332b00a26c7cb9af6433c8.tar.gz

Merged changes r32805, r32806, r32807, r32812, r32813 and r32814 from trunk.

git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha1@32861 a95241bf-73f2-0310-859d-f6bbb57e9c96

Diff

 headers/os/device/CAM.h               | 230 ++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------
 src/kits/storage/Volume.cpp           |   8 ++++++--
 src/system/kernel/signal.cpp          |  13 +++++--------
 src/system/kernel/debug/debug.cpp     |   5 +++--
 src/system/kernel/fs/rootfs.cpp       |  13 ++++++++++---
 src/system/libroot/posix/utime.c      |  22 ++++++++++++++--------
 src/system/libroot/posix/sys/utimes.c |  44 +++++++++++++++++++++++++++++++++++++-------
 7 files changed, 180 insertions(+), 155 deletions(-)

diff --git a/headers/os/device/CAM.h b/headers/os/device/CAM.h
index 614a4ba..fab94c0 100644
--- a/headers/os/device/CAM.h
+++ b/headers/os/device/CAM.h
@@ -1,27 +1,20 @@
/* ++++++++++
	CAM.h
	Copyright (c) 1996-98 by Be Incorporated.  All Rights Reserved.

	Definitions for the SCSI Common Access Method as implemented in the Be OS.

	See also "Draft Proposed American National Standard, SCSI-2 Common
	Access Method Transport and SCSI Interface Module", Revision 12, 
	ANSI refernce number X3.232-199x.

	This file consists of the definitions for the fictional "UNIVOS"
	operating system described in the standard.  The file is mostly
	the same text as the standard, with Be-provided additions as needed.
+++++ */

/*
 * Copyright 2009, Haiku, Inc. All rights reserved.
 * Distributed under the terms of the MIT License.
 *
 *
 * Definitions for the SCSI Common Access Method as implemented in Haiku.
 *
 * See also "Draft Proposed American National Standard, SCSI-2 Common
 * Access Method Transport and SCSI Interface Module", Revision 12, 
 * ANSI refernce number X3.232-199x.
 * 
*/

#ifndef _CAM_H
#define _CAM_H

#include <bus_manager.h>

/* ---
   Be-provided additions to the standard include file.
--- */

#include <sys/types.h>

@@ -41,22 +34,19 @@
typedef unsigned short U16;
#endif

/* Haiku specific additions */

typedef struct {
	uint32 serial;  /* operation serial number                    */
	uint32 micros;  /* operation time in microseconds (4294s max) */
	uint32 bytes;   /* number of bytes to transfer                */
	uchar path;     /* target SIM ID                              */
	uchar target;   /* target device ID                           */
	uchar sgcount;  /* # of sg segments (0 if non-sg operation)   */
	uchar scsi_op;  /* scsi operation byte                        */	
	uint32	serial;		/* operation serial number                    */
	uint32	micros;		/* operation time in microseconds (4294s max) */
	uint32	bytes;		/* number of bytes to transfer                */
	uchar	path;		/* target SIM ID                              */
	uchar	target;		/* target device ID                           */
	uchar	sgcount;	/* # of sg segments (0 if non-sg operation)   */
	uchar	scsi_op;	/* scsi operation byte                        */	
} cam_iostat;


/* -----
   The rest of this file contains the definitions and data structures for
   the CAM Subsystem interface.  The contents of this file should match the
   data structures and constants that are specified in the CAM document
----- */
/* End of Haiku specific additions */

/* Defines for the XPT function codes, Table 8-2 in the CAM spec. */

@@ -91,8 +81,6 @@
#define XPT_FUNC		0x7F	/* TEMPLATE */
#define XPT_VUNIQUE		0x80	/* All the rest are vendor unique commands */

/* ---------------------------------------------------------------------- */

/* General allocation length defines for the CCB structures. */

#define IOCDBLEN	12	/* Space for the CDB bytes/pointer */
@@ -100,8 +88,8 @@
#define SIM_ID		16	/* ASCII string len for SIM ID */
#define HBA_ID		16	/* ASCII string len for HBA ID */

#define BE_SIM_CCB_SIZE 1536    /* we want to allocate 1.5k chunks */
#define BE_SIM_SCSIIO_SIZE 88   /* sizeof(CAM_CCB_SCSIIO) - SIM_PRIV */  
#define BE_SIM_CCB_SIZE		1536	/* we want to allocate 1.5k chunks */
#define BE_SIM_SCSIIO_SIZE	88		/* sizeof(CAM_CCB_SCSIIO) - SIM_PRIV */  
#define SIM_PRIV	(BE_SIM_CCB_SIZE - BE_SIM_SCSIIO_SIZE) /* Length of SIM private data area */

/* SIM_PRIV (sim private data area)  Terms and Conditions:
@@ -124,15 +112,15 @@
/* Common CCB header definition. */
typedef struct ccb_header
{
	uint32          phys_addr;      /* physical address of this CCB */
	uint16			cam_ccb_len;	/* Length of the entire CCB */
	uchar			cam_func_code;	/* XPT function code */
	uchar			cam_status;		/* Returned CAM subsystem status */
	uchar			cam_hrsvd0;		/* Reserved field, for alignment */ 
	uchar			cam_path_id;	/* Path ID for the request */
	uchar			cam_target_id;	/* Target device ID */
	uchar			cam_target_lun;	/* Target LUN number */
	uint32			cam_flags;		/* Flags for operation of the subsystem */
	uint32		phys_addr;		/* physical address of this CCB */
	uint16		cam_ccb_len;	/* Length of the entire CCB */
	uchar		cam_func_code;	/* XPT function code */
	uchar		cam_status;		/* Returned CAM subsystem status */
	uchar		cam_hrsvd0;		/* Reserved field, for alignment */ 
	uchar		cam_path_id;	/* Path ID for the request */
	uchar		cam_target_id;	/* Target device ID */
	uchar		cam_target_lun;	/* Target LUN number */
	uint32		cam_flags;		/* Flags for operation of the subsystem */
} CCB_HEADER;

/* Common SCSI functions. */
@@ -140,16 +128,16 @@
/* Union definition for the CDB space in the SCSI I/O request CCB */
typedef union cdb_un
{
	uchar	*cam_cdb_ptr;				/* Pointer to the CDB bytes to send */
	uchar	cam_cdb_bytes[ IOCDBLEN ];	/* Area for the CDB to send */
	uchar*	cam_cdb_ptr;				/* Pointer to the CDB bytes to send */
	uchar	cam_cdb_bytes[IOCDBLEN];	/* Area for the CDB to send */
} CDB_UN;

/* Get device type CCB */
typedef struct ccb_getdev
{
	CCB_HEADER	cam_ch;					/* Header information fields */
	char		*cam_inq_data;			/* Ptr to the inquiry data space */
	uchar		cam_pd_type;			/* Periph device type from the TLUN */
	CCB_HEADER	cam_ch;			/* Header information fields */
	char*		cam_inq_data;	/* Ptr to the inquiry data space */
	uchar		cam_pd_type;	/* Periph device type from the TLUN */
} CCB_GETDEV;

/* Path inquiry CCB */
@@ -161,52 +149,52 @@
	uchar		cam_target_sprt;			/* Flags for target mode support */
	uchar		cam_hba_misc;				/* Misc HBA feature flags */
	uint16		cam_hba_eng_cnt;			/* HBA engine count */
	uchar		cam_vuhba_flags[ VUHBA ];	/* Vendor unique capabilities */
	uchar		cam_vuhba_flags[VUHBA];		/* Vendor unique capabilities */
	uint32		cam_sim_priv;				/* Size of SIM private data area */
	uint32		cam_async_flags;			/* Event cap. for Async Callback */
	uchar		cam_hpath_id;				/* Highest path ID in the subsystem */
	uchar		cam_initiator_id;			/* ID of the HBA on the SCSI bus */
	uchar		cam_prsvd0;					/* Reserved field, for alignment */
	uchar		cam_prsvd1;					/* Reserved field, for alignment */
	char		cam_sim_vid[ SIM_ID ];		/* Vendor ID of the SIM */
	char		cam_hba_vid[ HBA_ID ];		/* Vendor ID of the HBA */
	uchar		*cam_osd_usage;				/* Ptr for the OSD specific area */
	char		cam_sim_vid[SIM_ID];		/* Vendor ID of the SIM */
	char		cam_hba_vid[HBA_ID];		/* Vendor ID of the HBA */
	uchar*		cam_osd_usage;				/* Ptr for the OSD specific area */
} CCB_PATHINQ;

/* Release SIM Queue CCB */
typedef struct ccb_relsim
{
	CCB_HEADER	cam_ch;						/* Header information fields */
	CCB_HEADER	cam_ch;				/* Header information fields */
} CCB_RELSIM;

/* SCSI I/O Request CCB */
typedef struct ccb_scsiio
{
	CCB_HEADER	cam_ch;					/* Header information fields */
	uchar		*cam_pdrv_ptr;			/* Ptr used by the Peripheral driver */
	CCB_HEADER	*cam_next_ccb;			/* Ptr to the next CCB for action */
	uchar		*cam_req_map;			/* Ptr for mapping info on the Req. */
	void		(*cam_cbfcnp)(struct ccb_scsiio *);		
	                                    /* Callback on completion function */
	uchar		*cam_data_ptr;			/* Pointer to the data buf/SG list */
	uint32		cam_dxfer_len;			/* Data xfer length */
	uchar		*cam_sense_ptr;			/* Pointer to the sense data buffer */
	uchar		cam_sense_len;			/* Num of bytes in the Autosense buf */
	uchar		cam_cdb_len;			/* Number of bytes for the CDB */
	uint16		cam_sglist_cnt;			/* Num of scatter gather list entries */
	uint32		cam_sort;				/* Value used by SIM to sort on */
	uchar		cam_scsi_status;		/* Returned scsi device status */
	uchar		cam_sense_resid;		/* Autosense resid length: 2's comp */
	uchar		cam_osd_rsvd1[2];		/* OSD Reserved field, for alignment */
	int32		cam_resid;				/* Transfer residual length: 2's comp */
	CDB_UN		cam_cdb_io;				/* Union for CDB bytes/pointer */
	uint32		cam_timeout;			/* Timeout value */
	uchar		*cam_msg_ptr;			/* Pointer to the message buffer */
	uint16		cam_msgb_len;			/* Num of bytes in the message buf */
	uint16		cam_vu_flags;			/* Vendor unique flags */
	uchar		cam_tag_action;			/* What to do for tag queuing */
	uchar		cam_iorsvd0[3];			/* Reserved field, for alignment */
	uchar		cam_sim_priv[ SIM_PRIV ];	/* SIM private data area */
	CCB_HEADER	cam_ch;				/* Header information fields */
	uchar*		cam_pdrv_ptr;		/* Ptr used by the Peripheral driver */
	CCB_HEADER*	cam_next_ccb;		/* Ptr to the next CCB for action */
	uchar*		cam_req_map;		/* Ptr for mapping info on the Req. */
	void		(*cam_cbfcnp)(struct ccb_scsiio*);		
									/* Callback on completion function */
	uchar*		cam_data_ptr;		/* Pointer to the data buf/SG list */
	uint32		cam_dxfer_len;		/* Data xfer length */
	uchar*		cam_sense_ptr;		/* Pointer to the sense data buffer */
	uchar		cam_sense_len;		/* Num of bytes in the Autosense buf */
	uchar		cam_cdb_len;		/* Number of bytes for the CDB */
	uint16		cam_sglist_cnt;		/* Num of scatter gather list entries */
	uint32		cam_sort;			/* Value used by SIM to sort on */
	uchar		cam_scsi_status;	/* Returned scsi device status */
	uchar		cam_sense_resid;	/* Autosense resid length: 2's comp */
	uchar		cam_osd_rsvd1[2];	/* OSD Reserved field, for alignment */
	int32		cam_resid;			/* Transfer residual length: 2's comp */
	CDB_UN		cam_cdb_io;			/* Union for CDB bytes/pointer */
	uint32		cam_timeout;		/* Timeout value */
	uchar*		cam_msg_ptr;		/* Pointer to the message buffer */
	uint16		cam_msgb_len;		/* Num of bytes in the message buf */
	uint16		cam_vu_flags;		/* Vendor unique flags */
	uchar		cam_tag_action;		/* What to do for tag queuing */
	uchar		cam_iorsvd0[3];		/* Reserved field, for alignment */
	uchar		cam_sim_priv[SIM_PRIV];	/* SIM private data area */
} CCB_SCSIIO;

/* Set Async Callback CCB */
@@ -215,15 +203,15 @@
	CCB_HEADER	cam_ch;					/* Header information fields */
	uint32		cam_async_flags;		/* Event enables for Callback resp */
	void		(*cam_async_func)();	/* Async Callback function address */
	uchar		*pdrv_buf;				/* Buffer set aside by the Per. drv */
	uchar*		pdrv_buf;				/* Buffer set aside by the Per. drv */
	uchar		pdrv_buf_len;			/* The size of the buffer */
} CCB_SETASYNC;

/* Set device type CCB */
typedef struct ccb_setdev
{
	CCB_HEADER	 cam_ch;				/* Header information fields */
	uchar		cam_dev_type;			/* Val for the dev type field in EDT */
	CCB_HEADER	cam_ch;				/* Header information fields */
	uchar		cam_dev_type;		/* Val for the dev type field in EDT */
} CCB_SETDEV;

/* SCSI Control Functions. */
@@ -232,7 +220,7 @@
typedef struct ccb_abort
{
	CCB_HEADER	cam_ch;					/* Header information fields */
	CCB_HEADER	*cam_abort_ch;			/* Pointer to the CCB to abort */
	CCB_HEADER*	cam_abort_ch;			/* Pointer to the CCB to abort */
} CCB_ABORT;

/* Reset SCSI Bus CCB */
@@ -251,7 +239,7 @@
typedef struct ccb_termio
{
	CCB_HEADER	cam_ch;					/* Header information fields */
	CCB_HEADER	*cam_termio_ch;			/* Pointer to the CCB to terminate */
	CCB_HEADER*	cam_termio_ch;			/* Pointer to the CCB to terminate */
} CCB_TERMIO;

/* Target mode structures. */
@@ -262,7 +250,7 @@
	CCB_HEADER	cam_ch;					/* Header information fields */
	uint16		cam_grp6_len;			/* Group 6 VU CDB length */
	uint16		cam_grp7_len;			/* Group 7 VU CDB length */
	uchar		*cam_ccb_listptr;		/* Pointer to the target CCB list */
	uchar*		cam_ccb_listptr;		/* Pointer to the target CCB list */
	uint16		cam_ccb_listcnt;		/* Count of Target CCBs in the list */
} CCB_EN_LUN;

@@ -272,20 +260,20 @@
	CCB_HEADER	cam_ch;					/* Header information fields */
	uint16		cam_grp6_length;		/* Group 6 Vendor Unique CDB Lengths */
	uint16		cam_grp7_length;		/* Group 7 Vendor Unique CDB Lengths */
	uchar		*cam_immed_notify_list;	/* Ptr to Immediate Notify CCB list */
	uchar*		cam_immed_notify_list;	/* Ptr to Immediate Notify CCB list */
	uint32		cam_immed_notify_cnt;	/* Number of Immediate Notify CCBs */
	uchar		*cam_accept_targ_list;	/* Ptr to Accept Target I/O CCB list */
	uchar*		cam_accept_targ_list;	/* Ptr to Accept Target I/O CCB list */
	uint32		cam_accept_targ_cnt;	/* Number of Accept Target I/O CCBs */
	uchar		cam_sim_priv[ SIM_PRIV ]; /* SIM private data area */
	uchar		cam_sim_priv[SIM_PRIV];	/* SIM private data area */
} CCB_ENABLE_LUN;

/* Immediate Notify CCB */
typedef struct ccb_immed_notify
{
	CCB_HEADER	cam_ch;					/* Header information fields */
	uchar		*cam_pdrv_ptr;			/* Ptr used by the Peripheral driver */
	uchar*		cam_pdrv_ptr;			/* Ptr used by the Peripheral driver */
	void		(*cam_cbfnot)();		/* Callback on notification function */
	uchar		*cam_sense_ptr;			/* Pointer to the sense data buffer */
	uchar*		cam_sense_ptr;			/* Pointer to the sense data buffer */
	uchar		cam_sense_len;			/* Num of bytes in the Autosense buf */
	uchar		cam_init_id;			/* ID of Initiator that selected */
	uint16		cam_seq_id;				/* Sequence Identifier */
@@ -306,13 +294,13 @@
typedef struct ccb_accept_targ
{
	CCB_HEADER	cam_ch;					/* Header information fields */
	uchar		*cam_pdrv_ptr;			/* Ptr used by the Peripheral driver */
	CCB_HEADER	*cam_next_ccb;			/* Ptr to the next CCB for action */
	uchar		*cam_req_map;			/* Ptr for mapping info on the Req. */
	uchar*		cam_pdrv_ptr;			/* Ptr used by the Peripheral driver */
	CCB_HEADER*	cam_next_ccb;			/* Ptr to the next CCB for action */
	uchar*		cam_req_map;			/* Ptr for mapping info on the Req. */
	void		(*cam_cbfcnot)();		/* Callback on completion function */
	uchar		*cam_data_ptr;			/* Pointer to the data buf/SG list */
	uchar*		cam_data_ptr;			/* Pointer to the data buf/SG list */
	uint32		cam_dxfer_len;			/* Data xfer length */
	uchar		*cam_sense_ptr;			/* Pointer to the sense data buffer */
	uchar*		cam_sense_ptr;			/* Pointer to the sense data buffer */
	uchar		cam_sense_len;			/* Num of bytes in the Autosense buf */
	uchar		cam_cdb_len;			/* Number of bytes for the CDB */
	uint16		cam_sglist_cnt;			/* Num of scatter gather list entries */
@@ -323,14 +311,14 @@
	int32		cam_resid;				/* Transfer residual length: 2's comp */
	CDB_UN		cam_cdb_io;				/* Union for CDB bytes/pointer */
	uint32		cam_timeout;			/* Timeout value */
	uchar		*cam_msg_ptr;			/* Pointer to the message buffer */
	uchar*		cam_msg_ptr;			/* Pointer to the message buffer */
	uint16		cam_msgb_len;			/* Num of bytes in the message buf */
	uint16		cam_vu_flags;			/* Vendor unique flags */
	uchar		cam_tag_action;			/* What to do for tag queuing */
	uchar		cam_tag_id;				/* Tag ID */
	uchar		cam_initiator_id;		/* Initiator ID */
	uchar		cam_iorsvd0[1];			/* Reserved field, for alignment */
	uchar		cam_sim_priv[ SIM_PRIV ]; /* SIM private data area */
	uchar		cam_sim_priv[SIM_PRIV];	/* SIM private data area */
} CCB_ACCEPT_TARG;

/* Continue Target I/O CCB */
@@ -350,13 +338,13 @@
typedef struct ccb_eng_exec	/* NOTE: must match SCSIIO size */
{
	CCB_HEADER	cam_ch;					/* Header information fields */
	uchar		*cam_pdrv_ptr;			/* Ptr used by the Peripheral driver */
	uchar*		cam_pdrv_ptr;			/* Ptr used by the Peripheral driver */
	uint32		cam_engrsvd0;			/* Reserved field, for alignment */
	uchar		*cam_req_map;			/* Ptr for mapping info on the Req. */
	uchar*		cam_req_map;			/* Ptr for mapping info on the Req. */
	void		(*cam_cbfcnp)();		/* Callback on completion function */
	uchar		*cam_data_ptr;			/* Pointer to the data buf/SG list */
	uchar*		cam_data_ptr;			/* Pointer to the data buf/SG list */
	uint32		cam_dxfer_len;			/* Data xfer length */
	uchar		*cam_engdata_ptr;		/* Pointer to the engine buffer data */
	uchar*		cam_engdata_ptr;		/* Pointer to the engine buffer data */
	uchar		cam_engrsvd1;			/* Reserved field, for alignment */
	uchar		cam_engrsvd2;			/* Reserved field, for alignment */
	uint16		cam_sglist_cnt;			/* Num of scatter gather list entries */
@@ -370,7 +358,7 @@
	uint16		cam_vu_flags;			/* Vendor unique flags */
	uchar		cam_engrsvd5;			/* Reserved field, for alignment */
	uchar		cam_engrsvd6[3];		/* Reserved field, for alignment */
	uchar		cam_sim_priv[ SIM_PRIV ]; /* SIM private data area */
	uchar		cam_sim_priv[SIM_PRIV]; /* SIM private data area */
} CCB_ENG_EXEC;

/* The sim_module_info definition is used to define the entry points for
@@ -382,14 +370,14 @@
typedef struct sim_module_info sim_module_info;

struct sim_module_info {
	module_info		minfo;
	module_info	minfo;
};

typedef struct CAM_SIM_ENTRY CAM_SIM_ENTRY;

struct CAM_SIM_ENTRY {
	status_t		(*sim_init)();
	int32			(*sim_action)();
	status_t	(*sim_init)();
	int32		(*sim_action)();
};

/* ---------------------------------------------------------------------- */
@@ -544,7 +532,7 @@

typedef struct sg_elem
{
	uchar		*cam_sg_address;		/* Scatter/Gather address */
	uchar*		cam_sg_address;		/* Scatter/Gather address */
	uint32		cam_sg_count;			/* Scatter/Gather count */
} SG_ELEM;

@@ -588,11 +576,11 @@

typedef struct async_info
{
	struct async_info	*cam_async_next;		/* pointer to the next structure */
	struct async_info*	cam_async_next;			/* pointer to the next structure */
	uint32				cam_event_enable;		/* Event enables for Callback resp */
	void				(*cam_async_func)();	/* Async Callback function address */
	uint32				cam_async_blen;			/* Length of "information" buffer */
	uchar				*cam_async_ptr;			/* Address for the "information */
	uchar*				cam_async_ptr;			/* Address for the "information */
} ASYNC_INFO;

/* The CAM EDT table contains the device information for all the
@@ -603,9 +591,9 @@
typedef struct cam_edt_entry
{
	int32		cam_tlun_found;			/* Flag for the existence of the target/LUN */
	ASYNC_INFO	*cam_ainfo;				/* Async callback list info for this B/T/L */
	ASYNC_INFO*	cam_ainfo;				/* Async callback list info for this B/T/L */
	uint32		cam_owner_tag;			/* Tag for the peripheral driver's ownership */
	char		cam_inq_data[ INQLEN ];	/* storage for the inquiry data */
	char		cam_inq_data[INQLEN];	/* storage for the inquiry data */
} CAM_EDT_ENTRY;


@@ -628,15 +616,15 @@
typedef struct ccb_extended_pathinq
{
	CCB_PATHINQ	cam_path;					/* Default path inquiry */
	char		cam_sim_version [ VERS ];	/* SIM version number */
	char		cam_hba_version [ VERS ];	/* HBA version number */
	char		cam_controller_family [ FAM_ID ]; /* Controller family */
	char		cam_controller_type [ TYPE_ID ]; /* Controller type */
	char		cam_sim_version[VERS];		/* SIM version number */
	char		cam_hba_version[VERS];		/* HBA version number */
	char		cam_controller_family[FAM_ID]; /* Controller family */
	char		cam_controller_type[TYPE_ID]; /* Controller type */
} CCB_EXTENDED_PATHINQ;


/* ---
	Vendor unique flags supported by Be OS (cam_vu_flags)
	Vendor unique flags supported by Haiku (cam_vu_flags)
--- */

enum {
@@ -655,9 +643,9 @@

struct cam_for_driver_module_info {
	bus_manager_info	minfo;	
	CCB_HEADER *		(*xpt_ccb_alloc)(void);
	void				(*xpt_ccb_free)(void *ccb);
	long				(*xpt_action)(CCB_HEADER *ccbh);
	CCB_HEADER*			(*xpt_ccb_alloc)(void);
	void				(*xpt_ccb_free)(void* ccb);
	long				(*xpt_action)(CCB_HEADER* ccbh);
};

#define	B_CAM_FOR_DRIVER_MODULE_NAME	"bus_managers/scsi/driver/v1"
@@ -670,8 +658,8 @@

struct cam_for_sim_module_info {
	bus_manager_info	minfo;	
	long				(*xpt_bus_register) (CAM_SIM_ENTRY *sim);
	long				(*xpt_bus_deregister) (long path);
	long				(*xpt_bus_register)(CAM_SIM_ENTRY* sim);
	long				(*xpt_bus_deregister)(long path);
};

#define	B_CAM_FOR_SIM_MODULE_NAME		"bus_managers/scsi/sim/v1"
diff --git a/src/kits/storage/Volume.cpp b/src/kits/storage/Volume.cpp
index 0fca362..e73e946 100644
--- a/src/kits/storage/Volume.cpp
+++ b/src/kits/storage/Volume.cpp
@@ -292,14 +292,18 @@
		FS_WRITE_FSINFO_NAME);
	if (error != B_OK)
		return error;

	// change the name of the mount point

	// R5 implementation checks, if an entry with the volume's old name
	// exists in the root directory and renames that entry, if it is indeed
	// the mount point of the volume (or a link referring to it). In all other
	// cases, nothing is done (even if the mount point is named like the
	// volume, but lives in a different directory).
	// We follow suit for the time being.
	// create the entry
	// NOTE: If the volume name itself is actually "boot", then this code
	// tries to rename /boot, but that is prevented in the kernel.

	BPath entryPath;
	BEntry entry;
	BEntry traversedEntry;
@@ -313,7 +317,7 @@
		&& traversedEntry.GetNodeRef(&entryNodeRef) == B_OK
		&& entryNodeRef.device == fDevice
		&& entryNodeRef.node == oldInfo.root) {
		traversedEntry.Rename(name, false);
		entry.Rename(name, false);
	}
	return error;
}
diff --git a/src/system/kernel/signal.cpp b/src/system/kernel/signal.cpp
index 1b16094..601e48c 100644
--- a/src/system/kernel/signal.cpp
+++ b/src/system/kernel/signal.cpp
@@ -59,7 +59,7 @@


static status_t deliver_signal(struct thread *thread, uint signal,
	uint32 flags, bool& reschedule);
	uint32 flags, bool &reschedule);



@@ -489,7 +489,7 @@
*/
static status_t
deliver_signal(struct thread *thread, uint signal, uint32 flags, 
	bool& reschedule)
	bool &reschedule)
{
	if (flags & B_CHECK_PERMISSION) {
		// ToDo: introduce euid & uid fields to the team and check permission
@@ -581,10 +581,8 @@
		GRAB_THREAD_LOCK();

		thread = thread_get_thread_struct_locked(id);
		if (thread != NULL) {
			status = deliver_signal(thread, signal, flags, 
				reschedule);
		}
		if (thread != NULL)
			status = deliver_signal(thread, signal, flags, reschedule);
	} else {
		// send a signal to the specified process group
		// (the absolute value of the id)
@@ -617,8 +615,7 @@
				if (thread != NULL) {
					// we don't stop because of an error sending the signal; we
					// rather want to send as much signals as possible
					status = deliver_signal(thread, signal, flags, 
						reschedule);
					status = deliver_signal(thread, signal, flags, reschedule);
				}

				RELEASE_THREAD_LOCK();
diff --git a/src/system/kernel/debug/debug.cpp b/src/system/kernel/debug/debug.cpp
index 3a15476..b8f265b 100644
--- a/src/system/kernel/debug/debug.cpp
+++ b/src/system/kernel/debug/debug.cpp
@@ -1297,7 +1297,6 @@
	debug_variables_init();
	frame_buffer_console_init(args);
	arch_debug_console_init_settings(args);
	tracing_init();

	// get debug settings

@@ -1319,7 +1318,9 @@

	syslog_init(args);

	return arch_debug_init(args);
	arch_debug_init(args);
	tracing_init();
	return B_OK;
}


diff --git a/src/system/kernel/fs/rootfs.cpp b/src/system/kernel/fs/rootfs.cpp
index b0147ec..bad69c9 100644
--- a/src/system/kernel/fs/rootfs.cpp
+++ b/src/system/kernel/fs/rootfs.cpp
@@ -930,9 +930,16 @@
	struct rootfs_vnode* fromDirectory = (rootfs_vnode*)_fromDir->private_node;
	struct rootfs_vnode* toDirectory = (rootfs_vnode*)_toDir->private_node;

	TRACE(("rootfs_rename: from %p (0x%Lx), fromName '%s', to %p (0x%Lx), "
		"toName '%s'\n", fromDirectory, fromDirectory->id, fromName, toDirectory,
		toDirectory->id, toName));
	TRACE(("rootfs_rename: from %p (0x%Lx, %s), fromName '%s', to %p "
		"(0x%Lx, %s), toName '%s'\n", fromDirectory, fromDirectory->id,
		fromDirectory->name != NULL ? fromDirectory->name : "NULL",
		fromName, toDirectory, toDirectory->id,
		toDirectory->name != NULL ? toDirectory->name : "NULL",
		toName));

	// Prevent renaming /boot, since that will stop everything from working.
	if (fromDirectory->id == 1 && strcmp(fromName, "boot") == 0)
		return EPERM;

	MutexLocker _(&fs->lock);

diff --git a/src/system/libroot/posix/utime.c b/src/system/libroot/posix/utime.c
index e06ddb5..5223b4b 100644
--- a/src/system/libroot/posix/utime.c
+++ b/src/system/libroot/posix/utime.c
@@ -1,14 +1,16 @@
/*
 * Copyright 2002-2008, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
 * Copyright 2002-2009, Axel Dörfler, axeld@pinc-software.de.
 * Distributed under the terms of the MIT License.
 */


#include <NodeMonitor.h>

#include <utime.h>
#include <time.h>

#include <errno.h>
#include <time.h>

#include <NodeMonitor.h>

#include <syscalls.h>


@@ -27,10 +29,14 @@
	status_t status;

	if (times != NULL) {
		stat.st_atime = times->actime;
		stat.st_mtime = times->modtime;
	} else
		stat.st_atime = stat.st_mtime = time(NULL);
		stat.st_atim.tv_sec = times->actime;
		stat.st_mtim.tv_sec = times->modtime;
		stat.st_atim.tv_nsec = stat.st_mtim.tv_nsec = 0;
	} else {
		bigtime_t now = real_time_clock_usecs();
		stat.st_atim.tv_sec = stat.st_mtim.tv_sec = now / 1000000;
		stat.st_atim.tv_nsec = stat.st_mtim.tv_nsec = (now % 1000000) * 1000;
	}

	status = _kern_write_stat(-1, path, true, &stat, sizeof(struct stat),
		B_STAT_MODIFICATION_TIME | B_STAT_ACCESS_TIME);
diff --git a/src/system/libroot/posix/sys/utimes.c b/src/system/libroot/posix/sys/utimes.c
index 00b442b..717ea0c 100644
--- a/src/system/libroot/posix/sys/utimes.c
+++ b/src/system/libroot/posix/sys/utimes.c
@@ -1,25 +1,47 @@
/*
 * Copyright 2006, Axel Dörfler, axeld@pinc-software.de.
 * Copyright 2006-2009, Axel Dörfler, axeld@pinc-software.de.
 * Distributed under the terms of the MIT License.
 */


#include <sys/time.h>
#include <utime.h>

#include <errno.h>

#include <NodeMonitor.h>

#include <syscalls.h>


#define RETURN_AND_SET_ERRNO(err) \
	if (err < 0) { \
		errno = err; \
		return -1; \
	} \
	return err;


int
utimes(const char *file, const struct timeval times[2])
utimes(const char* path, const struct timeval times[2])
{
	struct utimbuf buffer, *timeBuffer;
	struct stat stat;
	status_t status;

	if (times != NULL) {
		timeBuffer = &buffer;
		buffer.actime = times[0].tv_sec + times[0].tv_usec / 1000000LL;
		buffer.modtime = times[1].tv_sec + times[1].tv_usec / 1000000LL;
	} else
		timeBuffer = NULL;

	return utime(file, timeBuffer);
		stat.st_atim.tv_sec = times[0].tv_sec;
		stat.st_atim.tv_nsec = times[0].tv_usec * 1000;

		stat.st_mtim.tv_sec = times[1].tv_sec;
		stat.st_mtim.tv_nsec = times[1].tv_usec * 1000;
	} else {
		bigtime_t now = real_time_clock_usecs();
		stat.st_atim.tv_sec = stat.st_mtim.tv_sec = now / 1000000;
		stat.st_atim.tv_nsec = stat.st_mtim.tv_nsec = (now % 1000000) * 1000;
	}

	status = _kern_write_stat(-1, path, true, &stat, sizeof(struct stat),
		B_STAT_MODIFICATION_TIME | B_STAT_ACCESS_TIME);

	RETURN_AND_SET_ERRNO(status);
}