diff for duplicates of <46A7AB23.7050306@ce.jp.nec.com> diff --git a/a/1.txt b/N1/1.txt index 7fe5c75..edb541d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,3 +28,10 @@ A patch for LVM2 to use the exported function will follow. Thanks, -- Jun'ichi Nomura, NEC Corporation of America +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: dm-dm_create_dir.patch +Type: text/x-patch +Size: 2195 bytes +Desc: not available +URL: <http://listman.redhat.com/archives/lvm-devel/attachments/20070725/eaaba228/attachment.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 62f7ffb..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,5 +0,0 @@ -Content-Type: text/x-patch; - name="dm-dm_create_dir.patch" -Content-Transfer-Encoding: 7bit -Content-Disposition: inline; - filename="dm-dm_create_dir.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index be09e32..0000000 --- a/a/2.txt +++ /dev/null @@ -1,66 +0,0 @@ -lvm_fclose() calls dm_fclose(), which cause the static linker to -bring libdm-file.o in liblvm.a. Then there happens a conflict -of create_dir(). - -Fix the following build error: - -/usr/local/lib/libdevmapper.a(libdm-file.o): In function `create_dir': -/work/device-mapper/lib/libdm-file.c:59: multiple definition of `create_dir' -../lib/liblvm.a(lvm-file.o):/work/LVM2/lib/misc/lvm-file.c:177: first defined here -/usr/bin/ld: Warning: size of symbol `create_dir' changed from 176 in ../lib/liblvm.a(lvm-file.o) to 187 in /usr/local/lib/libdevmapper.a(libdm-file.o) - -Index: device-mapper.work/lib/.exported_symbols -=================================================================== ---- device-mapper.work.orig/lib/.exported_symbols -+++ device-mapper.work/lib/.exported_symbols -@@ -1,6 +1,7 @@ - dm_lib_release - dm_lib_exit - dm_driver_version -+dm_create_dir - dm_fclose - dm_get_library_version - dm_log -Index: device-mapper.work/lib/libdevmapper.h -=================================================================== ---- device-mapper.work.orig/lib/libdevmapper.h -+++ device-mapper.work/lib/libdevmapper.h -@@ -629,6 +629,12 @@ char *dm_basename(const char *path); - **************************/ - - /* -+ * Create a directory (with parent directories if necessary). -+ * Returns 1 on success, 0 on failure. -+ */ -+int dm_create_dir(const char *dir); -+ -+/* - * Close a stream, with nicer error checking than fclose's. - * Derived from gnulib's close-stream.c. - * -Index: device-mapper.work/lib/libdm-file.c -=================================================================== ---- device-mapper.work.orig/lib/libdm-file.c -+++ device-mapper.work/lib/libdm-file.c -@@ -55,7 +55,7 @@ out: - return r; - } - --int create_dir(const char *dir) -+int dm_create_dir(const char *dir) - { - struct stat info; - -Index: device-mapper.work/lib/ioctl/libdm-iface.c -=================================================================== ---- device-mapper.work.orig/lib/ioctl/libdm-iface.c -+++ device-mapper.work/lib/ioctl/libdm-iface.c -@@ -228,7 +228,7 @@ static int _create_control(const char *c - return 0; - - old_umask = umask(0022); -- ret = create_dir(dm_dir()); -+ ret = dm_create_dir(dm_dir()); - umask(old_umask); - - if (!ret) diff --git a/a/3.hdr b/a/3.hdr deleted file mode 100644 index 4b86001..0000000 --- a/a/3.hdr +++ /dev/null @@ -1,4 +0,0 @@ -Content-Type: text/plain; charset="us-ascii" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Content-Disposition: inline diff --git a/a/3.txt b/a/3.txt deleted file mode 100644 index 8b13789..0000000 --- a/a/3.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/a/content_digest b/N1/content_digest index 90a51fd..53ac3ea 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,9 @@ "ref\087wswplmgl.fsf@rho.meyering.net\0" "From\0Jun'ichi Nomura <j-nomura@ce.jp.nec.com>\0" - "Subject\0Re: [lvm-devel] new device-mapper required to build latest lvm from cvs\0" + "Subject\0new device-mapper required to build latest lvm from cvs\0" "Date\0Wed, 25 Jul 2007 15:57:23 -0400\0" - "To\0LVM2 development <lvm-devel@redhat.com>" - " jim@meyering.net\0" - "Cc\0device-mapper development <dm-devel@redhat.com>\0" - "\01:1\0" + "To\0lvm-devel@redhat.com\0" + "\00:1\0" "b\0" "Hi,\n" "\n" @@ -36,77 +34,13 @@ "\n" "Thanks,\n" "-- \n" - Jun'ichi Nomura, NEC Corporation of America - "\01:2\0" - "fn\0dm-dm_create_dir.patch\0" - "b\0" - "lvm_fclose() calls dm_fclose(), which cause the static linker to\n" - "bring libdm-file.o in liblvm.a. Then there happens a conflict\n" - "of create_dir().\n" - "\n" - "Fix the following build error:\n" - "\n" - "/usr/local/lib/libdevmapper.a(libdm-file.o): In function `create_dir':\n" - "/work/device-mapper/lib/libdm-file.c:59: multiple definition of `create_dir'\n" - "../lib/liblvm.a(lvm-file.o):/work/LVM2/lib/misc/lvm-file.c:177: first defined here\n" - "/usr/bin/ld: Warning: size of symbol `create_dir' changed from 176 in ../lib/liblvm.a(lvm-file.o) to 187 in /usr/local/lib/libdevmapper.a(libdm-file.o)\n" - "\n" - "Index: device-mapper.work/lib/.exported_symbols\n" - "===================================================================\n" - "--- device-mapper.work.orig/lib/.exported_symbols\n" - "+++ device-mapper.work/lib/.exported_symbols\n" - "@@ -1,6 +1,7 @@\n" - " dm_lib_release\n" - " dm_lib_exit\n" - " dm_driver_version\n" - "+dm_create_dir\n" - " dm_fclose\n" - " dm_get_library_version\n" - " dm_log\n" - "Index: device-mapper.work/lib/libdevmapper.h\n" - "===================================================================\n" - "--- device-mapper.work.orig/lib/libdevmapper.h\n" - "+++ device-mapper.work/lib/libdevmapper.h\n" - "@@ -629,6 +629,12 @@ char *dm_basename(const char *path);\n" - " **************************/\n" - " \n" - " /*\n" - "+ * Create a directory (with parent directories if necessary).\n" - "+ * Returns 1 on success, 0 on failure.\n" - "+ */\n" - "+int dm_create_dir(const char *dir);\n" - "+\n" - "+/*\n" - " * Close a stream, with nicer error checking than fclose's.\n" - " * Derived from gnulib's close-stream.c.\n" - " *\n" - "Index: device-mapper.work/lib/libdm-file.c\n" - "===================================================================\n" - "--- device-mapper.work.orig/lib/libdm-file.c\n" - "+++ device-mapper.work/lib/libdm-file.c\n" - "@@ -55,7 +55,7 @@ out:\n" - " \treturn r;\n" - " }\n" - " \n" - "-int create_dir(const char *dir)\n" - "+int dm_create_dir(const char *dir)\n" - " {\n" - " \tstruct stat info;\n" - " \n" - "Index: device-mapper.work/lib/ioctl/libdm-iface.c\n" - "===================================================================\n" - "--- device-mapper.work.orig/lib/ioctl/libdm-iface.c\n" - "+++ device-mapper.work/lib/ioctl/libdm-iface.c\n" - "@@ -228,7 +228,7 @@ static int _create_control(const char *c\n" - " \t\treturn 0;\n" - " \n" - " \told_umask = umask(0022);\n" - "-\tret = create_dir(dm_dir());\n" - "+\tret = dm_create_dir(dm_dir());\n" - " \tumask(old_umask);\n" - " \n" - " \tif (!ret)" - "\01:3\0" - "b\0" + "Jun'ichi Nomura, NEC Corporation of America\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: dm-dm_create_dir.patch\n" + "Type: text/x-patch\n" + "Size: 2195 bytes\n" + "Desc: not available\n" + URL: <http://listman.redhat.com/archives/lvm-devel/attachments/20070725/eaaba228/attachment.bin> -873ae91b2694fc1db92a366a9788195f65283403de71de63a912577c4d4b4ade +289019fb6d5b680a099267f21241ea36e06b666fbf6b1ec8d8627aa6d70ce8ba
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.