From 4ced9531e643e47df5b950cbfd2a1fb5f29f9e2b Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Tue, 18 Dec 2012 21:29:48 +0300 Subject: [PATCH] files: Open-code MAKE_GEN_ID macro into its single caller Signed-off-by: Pavel Emelyanov --- cr-dump.c | 2 +- include/file-ids.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/cr-dump.c b/cr-dump.c index 53261d5cd..26b006263 100644 --- a/cr-dump.c +++ b/cr-dump.c @@ -188,7 +188,7 @@ static int collect_fds(pid_t pid, struct parasite_drain_fd *dfds) static u32 make_gen_id(const struct fd_parms *p) { - return MAKE_FD_GENID(p->stat.st_dev, p->stat.st_ino, p->pos); + return ((u32)p->stat.st_dev) ^ ((u32)p->stat.st_ino) ^ ((u32)p->pos); } int do_dump_gen_file(struct fd_parms *p, int lfd, diff --git a/include/file-ids.h b/include/file-ids.h index ab054b502..3eb481423 100644 --- a/include/file-ids.h +++ b/include/file-ids.h @@ -10,9 +10,6 @@ #define FD_PID_INVALID (-2U) #define FD_DESC_INVALID (-3U) -#define MAKE_FD_GENID(dev, ino, pos) \ - (((u32)(dev) ^ (u32)(ino) ^ (u32)(pos))) - struct fdinfo_entry; extern int fd_id_generate(pid_t pid, FdinfoEntry *fe); extern u32 fd_id_generate_special(void);