[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Minios-devel] [UNIKRAFT PATCH] lib/vfscore: sys_ioctl() - Fix build with nolibc


  • To: minios-devel@xxxxxxxxxxxxx
  • From: Costin Lupu <costin.lupu@xxxxxxxxx>
  • Date: Wed, 11 Sep 2019 14:56:08 +0300
  • Cc: sharan.santhanam@xxxxxxxxx
  • Delivery-date: Wed, 11 Sep 2019 11:57:41 +0000
  • Ironport-phdr: 9a23:2d8TgxL9/OT4IpUUxdmcpTZWNBhigK39O0sv0rFitYgeL//xwZ3uMQTl6Ol3ixeRBMOHsqkC07Gd6vCoGTRZp8rY6jZaKN0EfiRGoP1epxYnDs+BBB+zB9/RRAt+Iv5/UkR49WqwK0lfFZW2TVTTpnqv8WxaQU2nZkJ6KevvB4Hdkdm82fys9J3PeQVIgye2ba9vIBmsogjdq8cbjZF+Jqs/xRfFv3hFcPlSyW90OF6fhRnx6tqu8JJ57yhcp/ct/NNcXKvneKg1UaZWByk8PWAv483ruxjDTQ+R6XYZT24bjBlGDRXb4R/jRpv+vTf0ueR72CmBIM35Vqs0Vii476dqUxDnliEKPCMk/W7Ni8xwiKVboA+9pxF63oXZbp2ZOOZ4c6jAe94RWGhPUdtLVyFZAo2ycZYBAeQCM+hftITxu0cCoAGiCQS2GO/j1jlFjWL2060g1OQhFBnL0RInH9IVrHTUrdP1P7oUX+Co1KnI0CjIYvRK1jf684jIbhEhofeWUbJ0bMrR0VQvGhjZgVWLs4DlJy6V2f8Xv2iB6OptTOSigHMkpQFpujWj28ghhpTTio8Wyl3I7zt1zJg3KNGiRkN3ecOoHZRNuy2ANIZ7QtkuT39mtSs00LEKpJG2cDYMxZ863RDQceaHfJKN4h/7UeaRJip3i2x9dbKkghay7VCgyurhVsmoyFpKrjRKkt3Ltn0VyRzT79KISvp5/ku7xTmPzBrf6vlZIU8vj6bbMZkhzqYxlpoVr0vDAjf7lFj5gaOLbEkp+eil5/75brn4pJKQLYF5hhn7Mqs0m8y/Beo4MhIJX2ie4emzyLrj/VblQLVLiP06iK3ZsI3CJcQGvaO2HxRV3pw76xaiFDiqys4YnX4fIFJfZB2Hl5TpO03JIP3gCPe/glKskDZsx/DdJ7HuH4vCLmbdn7flZrt9709cyBEvzdBE/Z5VBa8OIPTpVk/2rtzYAQczMxaozOb/FNV9yoQeVHqUAq+ZKqzSq0WH5uQ1L+mXfoAVvir9K/g/6P7ol3A5nEQQfa+30pQLbHC3BO9pL1+Hbnrx0Z89FjIPvww/S/evhFCcXDp7Y3epQ7l69jw9ToW8AtTtXIeo1ZeGxzu6GNVye3hbQgSHFmz0doPCX+oUdQqZOYl5jzZCT7/3GNxp7g2nqAKvk+kvFeHT4CBN7Z8=
  • Ironport-sdr: H0HhQhXwsTORAkmjfpQgD/iPnMpetwJVqeB1VJyDOFE+1m0xR1Syi0cF+V/Gyaj2XUQENr9KaX 6MDGrTK4mT9A==
  • List-id: Mini-os development list <minios-devel.lists.xenproject.org>

Commit 3dcccd04 introduced handling of FIOCLEX and FIONCLEX requests. However,
these flags are not defined in nolibc.

Signed-off-by: Costin Lupu <costin.lupu@xxxxxxxxx>
---
 lib/nolibc/include/sys/ioctl.h | 0
 lib/vfscore/syscalls.c         | 4 ++++
 2 files changed, 4 insertions(+)
 create mode 100644 lib/nolibc/include/sys/ioctl.h

diff --git a/lib/nolibc/include/sys/ioctl.h b/lib/nolibc/include/sys/ioctl.h
new file mode 100644
index 00000000..e69de29b
diff --git a/lib/vfscore/syscalls.c b/lib/vfscore/syscalls.c
index d375774a..e85c4eb5 100644
--- a/lib/vfscore/syscalls.c
+++ b/lib/vfscore/syscalls.c
@@ -390,12 +390,16 @@ sys_ioctl(struct vfscore_file *fp, unsigned long request, 
void *buf)
                return EBADF;
 
        switch (request) {
+#ifdef FIOCLEX
        case FIOCLEX:
                fp->f_flags |= O_CLOEXEC;
                break;
+#endif
+#ifdef FIONCLEX
        case FIONCLEX:
                fp->f_flags &= ~O_CLOEXEC;
                break;
+#endif
        default:
                error = vfs_ioctl(fp, request, buf);
                break;
-- 
2.20.1


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.