lsfd: add a helper function, new_ipc

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

diff --git a/misc-utils/lsfd-fifo.c b/misc-utils/lsfd-fifo.c
index aea143c7e5eb2c150a6ecad34ee87fc37dbd71da..704bc06da4cae969132ec949f6b390d019dd4d2a 100644 (file)
--- a/misc-utils/lsfd-fifo.c
+++ b/misc-utils/lsfd-fifo.c
@@ -107,6 +107,7 @@ static bool fifo_is_suitable_ipc(struct ipc *ipc, struct file *file)
 static const struct ipc_class *fifo_get_ipc_class(struct file *file __attribute__((__unused__)))
 {
        static const struct ipc_class fifo_ipc_class = {
+               .size = sizeof(struct fifo_ipc),
                .get_hash = fifo_get_hash,
                .is_suitable_ipc = fifo_is_suitable_ipc,
                .free = NULL,
@@ -125,10 +126,7 @@ static void fifo_initialize_content(struct file *file)
        if (ipc)
                goto link;
 
-       ipc = xmalloc(sizeof(struct fifo_ipc));
-       ipc->class = fifo_get_ipc_class(file);
-       INIT_LIST_HEAD(&ipc->endpoints);
-       INIT_LIST_HEAD(&ipc->ipcs);
+       ipc = new_ipc(fifo_get_ipc_class(file));
        ((struct fifo_ipc *)ipc)->ino = file->stat.st_ino;
 
        hash = fifo_get_hash(file);

diff --git a/misc-utils/lsfd.c b/misc-utils/lsfd.c
index 6d7fd13f3ce82e28f98b3a42025ebf517daffcfd..cdfe311b9d2e22b73cf770d26444084f54a9f4a5 100644 (file)
--- a/misc-utils/lsfd.c
+++ b/misc-utils/lsfd.c
@@ -1062,6 +1062,15 @@ static void finalize_ipc_table(void)
                list_free(&ipc_table.tables[i], struct ipc, ipcs, free_ipc);
 }
 
+struct ipc *new_ipc(const struct ipc_class *class)
+{
+       struct ipc *ipc = xcalloc(1, class->size);
+       ipc->class = class;
+       INIT_LIST_HEAD(&ipc->endpoints);
+       INIT_LIST_HEAD(&ipc->ipcs);
+       return ipc;
+}
+
 struct ipc *get_ipc(struct file *file)
 {
        int slot;

diff --git a/misc-utils/lsfd.h b/misc-utils/lsfd.h
index aec2c7a57ed932fe57efae292cba019fb7130523..5a1cc9891b5cf96a3cf21968629681dfe75a6d1c 100644 (file)
--- a/misc-utils/lsfd.h
+++ b/misc-utils/lsfd.h
@@ -203,11 +203,13 @@ struct ipc_endpoint {
 };
 
 struct ipc_class {
+       size_t size;
        unsigned int (*get_hash)(struct file *file);
        bool (*is_suitable_ipc)(struct ipc *ipc, struct file *file);
        void (*free)(struct ipc *ipc);
 };
 
+struct ipc *new_ipc(const struct ipc_class *class);
 struct ipc *get_ipc(struct file *file);
 void add_ipc(struct ipc *ipc, unsigned int hash);