kclient: include documentation in patch queue

diff --git a/src/kernel/ceph.txt b/src/kernel/ceph.txt
index 5c4954410972a418df7519319e38161ffd2afd25..ec7dbc2227144db9da930e59ad723731f87692f3 100644 (file)
--- a/src/kernel/ceph.txt
+++ b/src/kernel/ceph.txt
@@ -63,6 +63,24 @@ the identification of large disk space consumers relatively quick, as
 no 'du' or similar recursive scan of the file system is required.
 
 
+Mount Syntax
+============
+
+The basic mount syntax is:
+
+ # mount -t ceph monip[:port][,monip2[:port]...]:/[subdir] mnt
+
+You only need to specify a single monitor, as the client will get the
+full list when it connects.  (However, if the monitor you specify
+happens to be down, the mount won't succeed.)  The port can be left
+off if the monitor is using the default.  So if the monitor is at
+1.2.3.4,
+
+ # mount -t ceph 1.2.3.4:/ /mnt/ceph
+
+is sufficient.
+
+
 Mount Options
 =============
 

diff --git a/src/kernel/import_patch_set_into_linux_git.sh b/src/kernel/import_patch_set_into_linux_git.sh
index efaffe5f946cea711d97090136f65edbdf11aa62..84199c334a1fbe89d45327e7c21c3f6e51c54aad 100755 (executable)
--- a/src/kernel/import_patch_set_into_linux_git.sh
+++ b/src/kernel/import_patch_set_into_linux_git.sh
@@ -20,6 +20,14 @@ git apply $cephtree/src/kernel/kbuild.patch
 git branch -D series_start
 git branch series_start
 
+git add Documentation/filesystems/ceph.txt
+git commit -F - <<EOF
+ceph: documentation
+
+Mount options, syntax.
+
+EOF
+
 git add fs/ceph/ceph_fs.h
 git commit -F - <<EOF
 ceph: on-wire types
@@ -236,6 +244,7 @@ EOF
 
 git add fs/ceph/ceph_debug.h
 git add fs/ceph/ceph_tools.h
+git add fs/ceph/ceph_tools.c
 git add fs/ceph/proc.c
 git commit -F - <<EOF
 ceph: debugging