Add open flags translation layer

Author: Jan Engelhardt

gen_xl.pl

@@ -2,6 +2,8 @@
 
 use strict;
 
+open(STDOUT, ">xl_errno.c");
+
 if (scalar(@ARGV) == 0) {
 	@ARGV = qw(
 		/usr/include/asm-generic/errno-base.h
@@ -14,8 +16,6 @@
 print <<"--EOT";
 /* Generated by gen_xl_errno.pl */
 #include <errno.h>
-#include "xl_errno.h"
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
 
 static const int arch_to_generic_table[] = {
 	[0] = 0,
@@ -42,22 +42,4 @@
 
 print <<"--EOT";
 };
-
-/* x is always negative or zero */
-int generic_errno(int x)
-{
-	if (x < -ARRAY_SIZE(arch_to_generic_table))
-		return x;
-	else
-		return arch_to_generic_table[-x];
-}
-
-/* x is always negative or zero */
-int arch_errno(int x)
-{
-	if (x < -ARRAY_SIZE(generic_to_arch_table))
-		return x;
-	else
-		return generic_to_arch_table[-x];
-}
 --EOT

src/mount.c

@@ -124,7 +124,7 @@ static int ccgfs_create(const char *path, mode_t mode,
 
 	rq = mpkt_init(CCGFS_CREATE_REQUEST, PV_STRING + 2 * PV_32);
 	pkt_push_s(rq, path);
-	pkt_push_32(rq, filp->flags);
+	pkt_push_32(rq, generic_openflags(filp->flags));
 	pkt_push_32(rq, mode);
 	mpkt_send(out_fd, rq);
 
@@ -343,7 +343,7 @@ static int ccgfs_open(const char *path, struct fuse_file_info *filp)
 
 	rq = mpkt_init(CCGFS_OPEN_REQUEST, PV_STRING + PV_32);
 	pkt_push_s(rq, path);
-	pkt_push_32(rq, filp->flags);
+	pkt_push_32(rq, generic_openflags(filp->flags));
 	mpkt_send(out_fd, rq);
 
 	ret = mpkt_recv(CCGFS_OPEN_RESPONSE, &rp);

src/storage.c

@@ -92,11 +92,8 @@ static int localfs_create(int fd, struct lo_packet *rq)
 	struct lo_packet *rp;
 	int ret;
 
-#ifdef ENABLE_WORKAROUNDS
-	/* No idea why that is needed for older kernels... */
-	rq_flags &= ~O_NOATIME;
-#endif
-	if ((ret = openat(root_fd, at(rq_path), rq_flags, rq_mode)) < 0)
+	ret = openat(root_fd, at(rq_path), arch_openflags(rq_flags), rq_mode);
+	if (ret < 0)
 		return -errno;
 
 	rp = pkt_init(CCGFS_CREATE_RESPONSE, PV_32);
@@ -285,10 +282,8 @@ static int localfs_open(int fd, struct lo_packet *rq)
 	struct lo_packet *rp;
 	int ret;
 
-#ifdef ENABLE_WORKAROUNDS
-	rq_flags &= ~O_NOATIME;
-#endif
-	if ((ret = openat(root_fd, at(rq_path), rq_flags)) < 0)
+	ret = openat(root_fd, at(rq_path), arch_openflags(rq_flags));
+	if (ret < 0)
 		return -errno;
 
 	rp = pkt_init(CCGFS_OPEN_RESPONSE, PV_32);