From c538e4fb79d393d54b09a19230b0457f794382ad Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Thu, 22 Mar 2012 13:54:33 -0700 Subject: [PATCH] refresh --- meta | 7 ++-- patches/file-loc | 79 ++++++++++++++++++++++++++++++++++++++-- patches/refresh-temp | 85 -------------------------------------------- 3 files changed, 80 insertions(+), 91 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 5587259..60a0ff2 100644 --- a/meta +++ b/meta @@ -1,11 +1,10 @@ Version: 1 -Previous: 861ff063451614a2eac7932389821563576f8df8 -Head: 5ac0516470e37dc2e1329181b000fb6ef622eb0c +Previous: cdcc51ca42434040bfe2f886e56a19481c41f6cc +Head: c24acfe89c026133584c66501bdfececb3554b4b Applied: af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c rename-ibacm: 62fc4bdee12905d85332875439240523fad7bee0 - file-loc: b72172dfaa9c545e69b1f3c528404af3a81f01a1 - refresh-temp: 5ac0516470e37dc2e1329181b000fb6ef622eb0c + file-loc: c24acfe89c026133584c66501bdfececb3554b4b Unapplied: init-script: 0eb36b8d494d7d51ed3d25c71289c2f5abd845f9 fixup-man: 3b3d0caee4b583c2853c12c6728dbfac03d544f9 diff --git a/patches/file-loc b/patches/file-loc index 3280fe9..683c525 100644 --- a/patches/file-loc +++ b/patches/file-loc @@ -1,5 +1,5 @@ Bottom: b7ef43780109283b77986862aa8504222eb78bce -Top: b7ef43780109283b77986862aa8504222eb78bce +Top: ffbf8e3093adb07029773e3639a285aa6a0f7971 Author: Sean Hefty Date: 2012-03-22 10:29:46 -0700 @@ -13,4 +13,79 @@ Signed-off-by: Sean Hefty --- - +diff --git a/linux/osd.h b/linux/osd.h +index 33ea842..f085a58 100644 +--- a/linux/osd.h ++++ b/linux/osd.h +@@ -45,9 +45,9 @@ + #include + #include + +-#define ACM_DEST_DIR "/etc/ibacm" +-#define ACM_ADDR_FILE "acm_addr.cfg" +-#define ACM_OPTS_FILE "acm_opts.cfg" ++#define ACM_DEST_DIR "/etc/rdma" ++#define ACM_ADDR_FILE "ibacm_addr.cfg" ++#define ACM_OPTS_FILE "ibacm_opts.cfg" + + #define LIB_DESTRUCTOR __attribute__((destructor)) + #define CDECL_FUNC +diff --git a/src/acm.c b/src/acm.c +index 906c926..8a8d576 100644 +--- a/src/acm.c ++++ b/src/acm.c +@@ -205,11 +205,12 @@ static atomic_t counter[ACM_MAX_COUNTER]; + /* + * Service options - may be set through acm_opts file. + */ +-static char *opts_file = "/etc/ibacm/acm_opts.cfg"; +-static char *addr_file = "/etc/ibacm/acm_addr.cfg"; ++static char *opts_file = ACM_DEST_DIR "/" ACM_OPTS_FILE;//"/etc/rdma/ibacm_opts.cfg"; ++static char *addr_file = ACM_DEST_DIR "/" ACM_ADDR_FILE;//"/etc/rdma/ibacm_addr.cfg"; + static char log_file[128] = "/var/log/ibacm.log"; + static int log_level = 0; +-static char lock_file[128] = "/var/lock/ibacm.pid"; ++static char pid_file[128] = "/var/run/ibacm.pid"; ++static char lock_file[128] = "/var/run/subsys/ibacm"; + static enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM; + static enum acm_route_prot route_prot = ACM_ROUTE_PROT_ACM; + static enum acm_loopback_prot loopback_prot = ACM_LOOPBACK_PROT_LOCAL; +@@ -3111,21 +3112,33 @@ static FILE *acm_open_log(void) + + static int acm_open_lock_file(void) + { +- int lock_fd; ++ int lock_fd, pid_fd; + char pid[16]; + + lock_fd = open(lock_file, O_RDWR | O_CREAT, 0640); + if (lock_fd < 0) + return lock_fd; + +- if (lockf(lock_fd, F_TLOCK, 0)) { +- close(lock_fd); +- return -1; +- } ++ pid_fd = open(pid_file, O_RDWR | O_CREAT, 0640); ++ if (pid_fd < 0) ++ goto err1; ++ ++ if (lockf(lock_fd, F_TLOCK, 0)) ++ goto err2; ++ ++ if (lockf(pid_fd, F_TLOCK, 0)) ++ goto err2; + + sprintf(pid, "%d\n", getpid()); + write(lock_fd, pid, strlen(pid)); ++ write(pid_fd, pid, strlen(pid)); + return 0; ++ ++err2: ++ close(pid_fd); ++err1: ++ close(lock_fd); ++ return -1; + } + + static void daemonize(void) diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 1458b5e..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,85 +0,0 @@ -Bottom: b7ef43780109283b77986862aa8504222eb78bce -Top: ffbf8e3093adb07029773e3639a285aa6a0f7971 -Author: Sean Hefty -Date: 2012-03-22 13:54:33 -0700 - -Refresh of file-loc - ---- - -diff --git a/linux/osd.h b/linux/osd.h -index 33ea842..f085a58 100644 ---- a/linux/osd.h -+++ b/linux/osd.h -@@ -45,9 +45,9 @@ - #include - #include - --#define ACM_DEST_DIR "/etc/ibacm" --#define ACM_ADDR_FILE "acm_addr.cfg" --#define ACM_OPTS_FILE "acm_opts.cfg" -+#define ACM_DEST_DIR "/etc/rdma" -+#define ACM_ADDR_FILE "ibacm_addr.cfg" -+#define ACM_OPTS_FILE "ibacm_opts.cfg" - - #define LIB_DESTRUCTOR __attribute__((destructor)) - #define CDECL_FUNC -diff --git a/src/acm.c b/src/acm.c -index 906c926..8a8d576 100644 ---- a/src/acm.c -+++ b/src/acm.c -@@ -205,11 +205,12 @@ static atomic_t counter[ACM_MAX_COUNTER]; - /* - * Service options - may be set through acm_opts file. - */ --static char *opts_file = "/etc/ibacm/acm_opts.cfg"; --static char *addr_file = "/etc/ibacm/acm_addr.cfg"; -+static char *opts_file = ACM_DEST_DIR "/" ACM_OPTS_FILE;//"/etc/rdma/ibacm_opts.cfg"; -+static char *addr_file = ACM_DEST_DIR "/" ACM_ADDR_FILE;//"/etc/rdma/ibacm_addr.cfg"; - static char log_file[128] = "/var/log/ibacm.log"; - static int log_level = 0; --static char lock_file[128] = "/var/lock/ibacm.pid"; -+static char pid_file[128] = "/var/run/ibacm.pid"; -+static char lock_file[128] = "/var/run/subsys/ibacm"; - static enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM; - static enum acm_route_prot route_prot = ACM_ROUTE_PROT_ACM; - static enum acm_loopback_prot loopback_prot = ACM_LOOPBACK_PROT_LOCAL; -@@ -3111,21 +3112,33 @@ static FILE *acm_open_log(void) - - static int acm_open_lock_file(void) - { -- int lock_fd; -+ int lock_fd, pid_fd; - char pid[16]; - - lock_fd = open(lock_file, O_RDWR | O_CREAT, 0640); - if (lock_fd < 0) - return lock_fd; - -- if (lockf(lock_fd, F_TLOCK, 0)) { -- close(lock_fd); -- return -1; -- } -+ pid_fd = open(pid_file, O_RDWR | O_CREAT, 0640); -+ if (pid_fd < 0) -+ goto err1; -+ -+ if (lockf(lock_fd, F_TLOCK, 0)) -+ goto err2; -+ -+ if (lockf(pid_fd, F_TLOCK, 0)) -+ goto err2; - - sprintf(pid, "%d\n", getpid()); - write(lock_fd, pid, strlen(pid)); -+ write(pid_fd, pid, strlen(pid)); - return 0; -+ -+err2: -+ close(pid_fd); -+err1: -+ close(lock_fd); -+ return -1; - } - - static void daemonize(void) -- 2.41.0