[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3374-g652151f

Stefan Metzmacher metze at samba.org
Mon Jan 19 06:16:05 GMT 2009


The branch, v3-2-test has been updated
       via  652151fe7b0a48b5ae6272a088ce80ad428f1928 (commit)
       via  3c56cd9f701254dec33aa60b6f6b3fa90a28557a (commit)
       via  174b595bb171c32be9079f9f691b415ac0fdc635 (commit)
      from  ded86426c222b11b9c2e8d8e4cae5ed0eff19edd (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 652151fe7b0a48b5ae6272a088ce80ad428f1928
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jan 14 11:52:01 2009 +0100

    s3:docs: vfs_fileid manpage
    
    metze
    (cherry picked from commit 6a94b7b9270f3d69595b93e2632051c9842645c9)
    (cherry picked from commit 8e13be1db5c51002ae72c42c505a79406b2f4f63)

commit 3c56cd9f701254dec33aa60b6f6b3fa90a28557a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jan 14 13:59:09 2009 +0100

    s3:vfs_fileid: readd "fileid:algorithm" as option.
    
    "fileid:mapping" is still supported as fallback.
    
    metze
    (cherry picked from commit 554a89df0cf6d9832778e2913f9fe50b78baeedc)
    (cherry picked from commit fe9ad21b8cb5286845350fe2280da2cbe2647bb7)

commit 174b595bb171c32be9079f9f691b415ac0fdc635
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Apr 21 18:40:45 2008 +0200

    keep compatibility with v3-0-ctdb name for fileid:mapping option
    (cherry picked from commit 2856d2e4a43fbcc6c8f8ac7b1613828170362861)

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/manpages-3/vfs_fileid.8.xml |  112 ++++++++++++++++++++++++++++++++++
 source/modules/vfs_fileid.c          |   10 +++-
 2 files changed, 120 insertions(+), 2 deletions(-)
 create mode 100644 docs-xml/manpages-3/vfs_fileid.8.xml


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/vfs_fileid.8.xml b/docs-xml/manpages-3/vfs_fileid.8.xml
new file mode 100644
index 0000000..202d693
--- /dev/null
+++ b/docs-xml/manpages-3/vfs_fileid.8.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="vfs_fileid.8">
+
+<refmeta>
+	<refentrytitle>vfs_fileid</refentrytitle>
+	<manvolnum>8</manvolnum>
+	<refmiscinfo class="source">Samba</refmiscinfo>
+	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
+	<refmiscinfo class="version">3.2</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+	<refname>vfs_fileid</refname>
+	<refpurpose>Generates file_id structs with unique device id values for
+	cluster setups</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<cmdsynopsis>
+		<command>vfs objects = fileid</command>
+	</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+	<title>DESCRIPTION</title>
+
+	<para>This VFS module is part of the
+	<citerefentry><refentrytitle>samba</refentrytitle>
+	<manvolnum>7</manvolnum></citerefentry>
+	suite.</para>
+
+	<para>Samba uses file_id structs to uniquely identify files
+	for locking purpose. By default the file_id contains the device
+	and inode number returned by the <command>stat()</command> system call.
+	As the file_id is a unique identifier of a file, it must be the same
+	on all nodes in a cluster setup. This module overloads the
+	<command>SMB_VFS_FILE_ID_CREATE()</command> operation and
+	generates the device number based on the configured algorithm
+	(see the "fileid:algorithm" option).
+	</para>
+</refsect1>
+
+
+<refsect1>
+	<title>OPTIONS</title>
+
+	<variablelist>
+
+		<varlistentry>
+		<term>fileid:algorithm = ALGORITHM</term>
+		<listitem>
+		<para>Available algorithms are <command>fsname</command>
+		and <command>fsid</command>. The default value is
+		<command>fsname</command>.
+		</para>
+		<para>The <command>fsname</command> algorithm generates
+		device id by hashing the kernel device name.
+		</para>
+		<para>The <command>fsid</command> algorithm generates
+		the device id from the <command>f_fsid</command> returned
+		from the <command>statfs()</command> syscall.
+		</para>
+		</listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>fileid:mapping = ALGORITHM</term>
+		<listitem>
+		<para>This option is the legacy version of the
+		<command>fileid:algorithm</command> option, which was used in earlier
+		versions of fileid mapping feature in custom Samba 3.0 versions.
+		</para>
+		</listitem>
+		</varlistentry>
+
+	</variablelist>
+</refsect1>
+
+<refsect1>
+	<title>EXAMPLES</title>
+
+	<para>Usage of the <command>fileid</command> module with the
+	<command>fsid</command> algorithm:</para>
+
+<programlisting>
+        <smbconfsection name="[global]"/>
+	<smbconfoption name="vfs objects">fileid</smbconfoption>
+	<smbconfoption name="fileid:algorithm">fsid</smbconfoption>
+</programlisting>
+
+</refsect1>
+
+<refsect1>
+	<title>VERSION</title>
+
+	<para>This man page is correct for version 3.2 of the Samba suite.
+	</para>
+</refsect1>
+
+<refsect1>
+	<title>AUTHOR</title>
+
+	<para>The original Samba software and related utilities
+	were created by Andrew Tridgell. Samba is now developed
+	by the Samba Team as an Open Source project similar
+	to the way the Linux kernel is developed.</para>
+
+</refsect1>
+
+</refentry>
diff --git a/source/modules/vfs_fileid.c b/source/modules/vfs_fileid.c
index 5954a10..503db23 100644
--- a/source/modules/vfs_fileid.c
+++ b/source/modules/vfs_fileid.c
@@ -188,10 +188,16 @@ static int fileid_connect(struct vfs_handle_struct *handle,
 		return -1;
 	}
 
-	data->device_mapping_fn	= fileid_device_mapping_fsid;
+	/*
+	 * "fileid:mapping" is only here as fallback for old setups
+	 * "fileid:algorithm" is the option new setups should use
+	 */
 	algorithm = lp_parm_const_string(SNUM(handle->conn),
-					 "fileid", "algorithm",
+					 "fileid", "mapping",
 					 "fsname");
+	algorithm = lp_parm_const_string(SNUM(handle->conn),
+					 "fileid", "algorithm",
+					 algorithm);
 	if (strcmp("fsname", algorithm) == 0) {
 		data->device_mapping_fn	= fileid_device_mapping_fsname;
 	} else if (strcmp("fsid", algorithm) == 0) {


-- 
Samba Shared Repository


More information about the samba-cvs mailing list