kclient: include new files in patch set

diff --git a/src/TODO b/src/TODO
index e17565d4bec83bdfc68568a45e549dc38066aad7..5e9d6a17cd2f1e1b8dfb113f2af17b034571b931 100644 (file)
--- a/src/TODO
+++ b/src/TODO
@@ -29,7 +29,7 @@ v0.16
 - ceph_buffer and vmalloc?
 - ceph_i_test
 - bit ops in messenger
-- name args in ceph_osd_op union
+/- name args in ceph_osd_op union
 
 bugs
 - mislinked directory?

diff --git a/src/kernel/import_patch_set_into_linux_git.sh b/src/kernel/import_patch_set_into_linux_git.sh
index ee5cc3706a76047d1dcb8ae3e1bb3b86edfddd98..16446e43927d506023bf335f657cd523ab30a7ee 100755 (executable)
--- a/src/kernel/import_patch_set_into_linux_git.sh
+++ b/src/kernel/import_patch_set_into_linux_git.sh
@@ -34,14 +34,17 @@ Mount options, syntax.
 EOF
 
 git add $target/ceph/ceph_fs.h
+git add $target/ceph/ceph_fs.c
 git add $target/ceph/msgr.h
 git add $target/ceph/rados.h
+git add $target/ceph/ceph_strings.c
 git commit -s -F - <<EOF
 ceph: on-wire types
 
 These headers describe the types used to exchange messages between the
 Ceph client and various servers.  All types are little-endian and
-packed.
+packed.  These headers are shared between the kernel and userspace, so
+all types are in terms of e.g. __u32.
 
 Additionally, we define a few magic values to identify the current
 version of the protocol(s) in use, so that discrepancies to be
@@ -53,6 +56,8 @@ git add $target/ceph/types.h
 git add $target/ceph/super.h
 git add $target/ceph/ceph_ver.h
 git add $target/ceph/ceph_debug.h
+git add $target/ceph/ceph_frag.h
+git add $target/ceph/ceph_frag.c
 git commit -s -F - <<EOF
 ceph: client types
 
@@ -65,13 +70,14 @@ monitor clients, and the messaging layer.
 EOF
 
 git add $target/ceph/buffer.h
+git add $target/ceph/buffer.c
 git commit -s -F - <<EOF
 ceph: ref counted buffer
 
 struct ceph_buffer is a simple ref-counted buffer.  We transparently
 choose between kmalloc for small buffers and vmalloc for large ones.
 
-This is used for allocating memory for xattr data, among other things.
+This is currently used only for allocating memory for xattr data.
 
 EOF
 
@@ -86,6 +92,7 @@ EOF
 
 
 git add $target/ceph/inode.c
+git add $target/ceph/xattr.c
 git commit -s -F - <<EOF
 ceph: inode operations