PERFORCE change 124047 for review
Matt Jacob
mjacob at FreeBSD.org
Tue Jul 24 19:25:28 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=124047
Change 124047 by mjacob at mjexp on 2007/07/24 19:24:43
More IFC
Affected files ...
.. //depot/projects/mjexp/contrib/pf/pflogd/pidfile.c#2 integrate
.. //depot/projects/mjexp/contrib/pf/pflogd/pidfile.h#2 integrate
.. //depot/projects/mjexp/sbin/iscontrol/iscontrol.8#2 integrate
.. //depot/projects/mjexp/sbin/iscontrol/iscsi.conf.5#2 integrate
.. //depot/projects/mjexp/share/man/man4/iscsi_initiator.4#2 integrate
.. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_vfsops.c#6 integrate
Differences ...
==== //depot/projects/mjexp/contrib/pf/pflogd/pidfile.c#2 (text+ko) ====
==== //depot/projects/mjexp/contrib/pf/pflogd/pidfile.h#2 (text+ko) ====
==== //depot/projects/mjexp/sbin/iscontrol/iscontrol.8#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/iscontrol/iscontrol.8,v 1.1 2007/07/24 15:35:01 scottl Exp $
+.\" $FreeBSD: src/sbin/iscontrol/iscontrol.8,v 1.2 2007/07/24 18:08:15 brueffer Exp $
.\"
.Dd February 22, 2007
.Dt ISCONTROL 8
@@ -45,14 +45,15 @@
the
.Nm
program is the userland side of an iSCSI session, see
-iscsi_initiator(4).
+.Xr iscsi_initiator 4 .
It has 2 modes of operation, if -d (discovery session) is specified,
it will print out the
.Em target names
returned by the target and exit.
-In the second mode, it will, after a succesful login/negotiation, run
+In the second mode, it will, after a successful login/negotiation, run
in daemon mode, monitoring the connection, and will try to reconnect
-in case of a network/target failure. It will terminate/logout the session
+in case of a network/target failure.
+It will terminate/logout the session
when a SIGHUP signal is received.
The flags are as follows:
.Bl -tag -width variable=value
@@ -65,17 +66,21 @@
.It Fl c Ar file
a file containing configuration
.Em key-options ,
-see iscsi.conf(5)
+see
+.Xr iscsi.conf 5
.It Fl n Ar nickname
if
.Sy -c file
is specified, then search for the block named
.Em nickname
-in that file, see iscsi.conf(5)
+in that file, see
+.Xr iscsi.conf 5
.It Fl t Ar target
is the target's IP address or name
.It Ar variable Ns = Ns Ar value
-see iscsi.conf(5) for the complete list of variables/options and their
+see
+.Xr iscsi.conf 5
+for the complete list of variables/options and their
possible values.
.El
.Sh EXAMPLES
@@ -87,21 +92,23 @@
print to stdout the list of available targetnames/targetadresses.
Note: this listing does not necessarily mean availability, since
depending on the target configuration, a discovery session might
-not need login/access permition, but a
+not need login/access permission, but a
.Em full session
certainly does.
.sp
.Dl iscontrol -c /etc/iscsi.conf -n myiscsi
.Pp
-will read options from file /etc/iscsi.conf, use the targetaddress
+will read options from
+.Pa /etc/iscsi.conf ,
+use the targetaddress
found in the block nicknamed myiscsi, login and negotiate
whatever options are specified, and start an iscsi-session.
.Sh SEE ALSO
+.Xr da 4 ,
.Xr iscsi_initiator 4 ,
+.Xr sa 4 ,
.Xr iscsi.conf 5 ,
-.Xr camcontrol 8 ,
-.Xr da 4 ,
-.Xr sa 4
+.Xr camcontrol 8
.Sh STANDARDS
RFC 3720
.\"Sh HISTORY
@@ -110,7 +117,7 @@
should probably load the iscsi_initiator module if needed.
.br
Not all functions/specifications have been implemented yet, noticeably
-missing are the Task Management Funtions.
+missing are the Task Management Functions.
The error recovery, though not
.Em fully compliant
does a brave effort to recover from network disconnects.
==== //depot/projects/mjexp/sbin/iscontrol/iscsi.conf.5#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/iscontrol/iscsi.conf.5,v 1.1 2007/07/24 15:35:01 scottl Exp $
+.\" $FreeBSD: src/sbin/iscontrol/iscsi.conf.5,v 1.2 2007/07/24 18:08:15 brueffer Exp $
.\"
.Dd June 5, 2007
.Os
@@ -35,7 +35,8 @@
.Nm ,
is read by the
.Xr iscontrol 8
-program, it contains declarations and parameter/key-options.
+program.
+It contains declarations and parameter/key-options.
The syntax is very simple,
.D1 Li variable = value;
and they can be grouped via a
@@ -55,13 +56,16 @@
for a full description see sections 11/12 of the RFC.
.Bl -tag -width MaxConnections
.It Cm AuthMethod
-current only supported authentication method is CHAP, with
-digest either MD5 or SHA. Default is none.
+currently only supported authentication method is CHAP, with
+digest either MD5 or SHA.
+Default is none.
.It Cm HeaderDigest
a
.Em digest
is calculated on the header of all iSCSI PDUs, and
-checked. Only CRC32C is implemented. Default is none.
+checked.
+Only CRC32C is implemented.
+Default is none.
.It Cm DataDigest
same as for HeaderDigest, but on the data part of the iSCSI PDU.
.It Cm MaxConnections
@@ -118,7 +122,7 @@
.It Cm ErrorRecoveryLevel
Only level 0 is supported.
.It Cm SessionType
-either Discovery or Normal, default is Normal, see the
+either Discovery or Normal, default is Normal, see the
.Fl d
flag of
.Cm iscontrol .
@@ -128,7 +132,7 @@
.Sy RFC 3720
.Bl -tag -width sockbufsize
.It Cm port
-The iscsi port used by the iscsi protocol, defaults to 3260.
+The iSCSI port used by the iSCSI protocol, defaults to 3260.
.It Cm tags
Sets the
.Em tag opening
@@ -137,23 +141,25 @@
overrides the compiled value of
.Sy luns ,
see
-.Xr iscsi_initiator 4 . This value can only be reduced.
+.Xr iscsi_initiator 4 .
+This value can only be reduced.
.It Cm sockbufsize
sets the receiver and transmitter socket buffer size to
.Em size,
-in kilobites. The default is 128.
+in kilobytes.
+The default is 128.
.El
.sp
If
-.Em AutheMethod
+.Em AuthMethod
is set to
.Cm CHAP ,
then the following must also be set:
.Bl -tag -width chapSecret
.It Cm chapSecret
this
-.Em shared-secret.
-Can be either an ascci string (e.g. hello world), a hex string (e.g
+.Em shared-secret .
+Can be either an ASCII string (e.g. hello world), a hex string (e.g
0xababcd0987654321...), or base64 string (eg 0b...)
.It Cm chapIName
the chap-name, defaults to
@@ -188,7 +194,7 @@
}
.Ed
.Sh ERRORS
-The parsing is very primitive, so don't expect - at the moment - any
+The parsing is very primitive, so do not expect - at the moment - any
error messages.
.Sh SEE ALSO
.Xr iscsi_initiator 4 ,
==== //depot/projects/mjexp/share/man/man4/iscsi_initiator.4#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/iscsi_initiator.4,v 1.1 2007/07/24 15:35:00 scottl Exp $
+.\" $FreeBSD: src/share/man/man4/iscsi_initiator.4,v 1.2 2007/07/24 18:08:16 brueffer Exp $
.\"
.Dd February 23, 2007
.Os
@@ -47,11 +47,12 @@
.Sh DESCRIPTION
The
.Nm
-implements the kernel side of the Internet ISCSI (iSCSI) network
+implements the kernel side of the Internet SCSI (iSCSI) network
protocol standard, the user land companion is
-.Xr iscontrol 8, and permits access to remote
+.Xr iscontrol 8 ,
+and permits access to remote
.Em virtual
-SCSI devices via the
+SCSI devices via
.Xr cam 4 .
.Sh SYSCTL VARIABLES
.Bl -tag -width ".Va net.iscsi.n.targeaddress"
@@ -83,21 +84,21 @@
.El
.Sh FILES
The
-.NM
+.Nm
driver creates the following:
.Bl -tag -width ".Pa /dev/iscsi%dxx" -compact
+.Pp
.It Pa /dev/iscsi
-used to creat new sessions.
+used to create new sessions.
.It Pa /dev/iscsi%d
for each new session.
.El
-.\" .Sh ERRORS
.Sh SEE ALSO
-.Xr iscontrol 8 ,
.Xr cam 4 ,
-.Xr camcontrol 8
+.Xr camcontrol 8 ,
+.Xr iscontrol 8
.Sh STANDARDS
-ISCSI RFC 3720
+iSCSI RFC 3720
.\" .Sh HISTORY
.\" .Sh AUTHORS
.Sh BUGS
==== //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_vfsops.c#6 (text+ko) ====
@@ -48,7 +48,7 @@
* allocate and release resources.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vfsops.c,v 1.7 2007/07/23 06:54:58 delphij Exp $");
+__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vfsops.c,v 1.8 2007/07/24 17:14:53 delphij Exp $");
#include <sys/param.h>
#include <sys/limits.h>
@@ -268,7 +268,7 @@
mtx_init(&tmp->allnode_lock, "tmpfs allnode lock", NULL, MTX_DEF);
tmp->tm_nodes_max = nodes;
tmp->tm_nodes_inuse = 0;
- tmp->tm_maxfilesize = (cnt.v_page_count + get_swpgtotal()) * PAGE_SIZE;
+ tmp->tm_maxfilesize = (u_int64_t)(cnt.v_page_count + get_swpgtotal()) * PAGE_SIZE;
LIST_INIT(&tmp->tm_nodes_used);
tmp->tm_pages_max = pages;
More information about the p4-projects
mailing list