fdinfo: fd_is_special helper for maps and cwd

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>

files.c

@@ -178,10 +178,9 @@ int prepare_fd_pid(int pid)
 		if (e.len)
 			lseek(fdinfo_fd, e.len, SEEK_CUR);
 
-		if (e.type == FDINFO_MAP)
-			continue;
-		if (e.addr == FDINFO_CWD)
+		if (fd_is_special(&e))
 			continue;
+
 		if (collect_fd(pid, &e))
 			return -1;
 	}
@@ -534,7 +533,7 @@ int prepare_fds(int pid)
 						goto err;
 					continue;
 				}
-			} else if (fe.type == FDINFO_MAP || fe.addr == FDINFO_CWD) {
+			} else if (fd_is_special(&fe)) {
 				lseek(fdinfo_fd, fe.len, SEEK_CUR);
 				continue;
 			}

include/image.h

@@ -35,6 +35,8 @@ struct fdinfo_entry {
 	u8	name[0];
 } __packed;
 
+#define fd_is_special(fe)	(((fe)->type != FDINFO_FD) || ((fe)->addr == FDINFO_CWD))
+
 struct shmem_entry {
 	u64	start;
 	u64	end;