diff mbox series

[hurd,commited] hurd: Support for file record locking

Message ID 20191030002924.5548-1-samuel.thibault@ens-lyon.org
State New
Headers show
Series [hurd,commited] hurd: Support for file record locking | expand

Commit Message

Samuel Thibault Oct. 30, 2019, 12:29 a.m. UTC 
From: Svante Signell <svante.signell@gmail.com>

        * sysdeps/mach/hurd/fcntl.c: Add support for file-record-lock RPC
          fixing posix file locking using the flock64 version of struct
          flock.
---
 sysdeps/mach/hurd/fcntl.c | 111 +++++++++++++++++++++++++++++---------
 1 file changed, 87 insertions(+), 24 deletions(-)

Comments

Joseph Myers Oct. 30, 2019, 5:03 p.m. UTC | #1 
On Wed, 30 Oct 2019, Samuel Thibault wrote:

> From: Svante Signell <svante.signell@gmail.com>
> 
>         * sysdeps/mach/hurd/fcntl.c: Add support for file-record-lock RPC
>           fixing posix file locking using the flock64 version of struct
>           flock.

I'm now seeing build failures with build-many-glibcs.py for i686-gnu.  Is 
this some issue with needing ultra-new versions of mig/gnumach/hurd which 
are only updated in the "compilers" step not the "glibcs" step?

In file included from ../sysdeps/hurd/include/hurd/fd.h:2,
                 from ../sysdeps/mach/hurd/fcntl.c:21:
../sysdeps/mach/hurd/fcntl.c: In function '__libc_fcntl':
../sysdeps/mach/hurd/fcntl.c:158:29: error: implicit declaration of function '__file_record_lock' [-Werror=implicit-function-declaration]
  158 |  err = HURD_FD_PORT_USE (d, __file_record_lock (port, cmd, &fl64,
      |                             ^~~~~~~~~~~~~~~~~~
../hurd/hurd/fd.h:137:15: note: in definition of macro 'HURD_FD_PORT_USE'
  137 |   __result = (expr);            \
      |               ^~~~
cc1: all warnings being treated as errors
Samuel Thibault Oct. 30, 2019, 5:05 p.m. UTC | #2 
Joseph Myers, le mer. 30 oct. 2019 17:03:14 +0000, a ecrit:
> On Wed, 30 Oct 2019, Samuel Thibault wrote:
> 
> > From: Svante Signell <svante.signell@gmail.com>
> > 
> >         * sysdeps/mach/hurd/fcntl.c: Add support for file-record-lock RPC
> >           fixing posix file locking using the flock64 version of struct
> >           flock.
> 
> I'm now seeing build failures with build-many-glibcs.py for i686-gnu.  Is 
> this some issue with needing ultra-new versions of mig/gnumach/hurd which 
> are only updated in the "compilers" step not the "glibcs" step?

> ../sysdeps/mach/hurd/fcntl.c:158:29: error: implicit declaration of function '__file_record_lock' [-Werror=implicit-function-declaration]

Yes, I have added it just before.

Samuel
diff mbox series

Patch

diff --git a/sysdeps/mach/hurd/fcntl.c b/sysdeps/mach/hurd/fcntl.c
index 26243682ca..0e3f0adbd9 100644
--- a/sysdeps/mach/hurd/fcntl.c
+++ b/sysdeps/mach/hurd/fcntl.c
@@ -130,23 +130,75 @@  __libc_fcntl (int fd, int cmd, ...)
     case F_SETLKW:
       {
 	struct flock *fl = va_arg (ap, struct flock *);
-	int wait = 0;
-	va_end (ap);
+
 	switch (cmd)
 	  {
 	  case F_GETLK:
-	    errno = ENOSYS;
-	    return -1;
-	  case F_SETLKW:
-	    wait = 1;
-	    /* FALLTHROUGH */
+	    cmd = F_GETLK64;
+	    break;
 	  case F_SETLK:
-	    return __f_setlk (fd, fl->l_type, fl->l_whence,
-			      fl->l_start, fl->l_len, wait);
+	    cmd = F_SETLK64;
+	    break;
+	  case F_SETLKW:
+	    cmd = F_SETLKW64;
+	    break;
 	  default:
 	    errno = EINVAL;
 	    return -1;
 	  }
+
+	struct flock64 fl64 = {
+	  .l_type = fl->l_type,
+	  .l_whence = fl->l_whence,
+	  .l_start = fl->l_start,
+	  .l_len = fl->l_len,
+	  .l_pid = fl->l_pid
+	};
+
+	err = HURD_FD_PORT_USE (d, __file_record_lock (port, cmd, &fl64,
+				MACH_PORT_NULL, MACH_MSG_TYPE_MAKE_SEND));
+
+	/* XXX: To remove once file_record_lock RPC is settled.  */
+	if (err == EMIG_BAD_ID || err == EOPNOTSUPP)
+	  {
+	    int wait = 0;
+	    va_end (ap);
+	    switch (cmd)
+	      {
+	      case F_GETLK64:
+		errno = ENOSYS;
+		return -1;
+	      case F_SETLKW64:
+		wait = 1;
+		/* FALLTHROUGH */
+	      case F_SETLK64:
+		return __f_setlk (fd, fl->l_type, fl->l_whence,
+				  fl->l_start, fl->l_len, wait);
+	      default:
+		errno = EINVAL;
+		return -1;
+	      }
+	  }
+	else if (cmd == F_GETLK64)
+	  {
+	    fl->l_type = fl64.l_type;
+	    fl->l_whence = fl64.l_whence;
+	    fl->l_start = fl64.l_start;
+	    fl->l_len = fl64.l_len;
+	    fl->l_pid = fl64.l_pid;
+
+	    if ((sizeof fl->l_start != sizeof fl64.l_start
+		 && fl->l_start != fl64.l_start)
+	     || (sizeof fl->l_len != sizeof fl64.l_len
+		 && fl->l_len != fl64.l_len))
+	      {
+		errno = EOVERFLOW;
+		return -1;
+	      }
+	  }
+
+	result = err ? __hurd_dfail (fd, err) : 0;
+	break;
       }
 
     case F_GETLK64:
@@ -154,23 +206,34 @@  __libc_fcntl (int fd, int cmd, ...)
     case F_SETLKW64:
       {
 	struct flock64 *fl = va_arg (ap, struct flock64 *);
-	int wait = 0;
-	va_end (ap);
-	switch (cmd)
+
+	err = HURD_FD_PORT_USE (d, __file_record_lock (port, cmd, fl,
+				MACH_PORT_NULL, MACH_MSG_TYPE_MAKE_SEND));
+
+	/* XXX: To remove once file_record_lock RPC is settled.  */
+	if (err == EMIG_BAD_ID || err == EOPNOTSUPP)
 	  {
-	  case F_GETLK64:
-	    errno = ENOSYS;
-	    return -1;
-	  case F_SETLKW64:
-	    wait = 1;
-	    /* FALLTHROUGH */
-	  case F_SETLK64:
-	    return __f_setlk (fd, fl->l_type, fl->l_whence,
-			      fl->l_start, fl->l_len, wait);
-	  default:
-	    errno = EINVAL;
-	    return -1;
+	    int wait = 0;
+	    va_end (ap);
+	    switch (cmd)
+	      {
+	      case F_GETLK64:
+		errno = ENOSYS;
+		return -1;
+	      case F_SETLKW64:
+		wait = 1;
+		/* FALLTHROUGH */
+	      case F_SETLK64:
+		return __f_setlk (fd, fl->l_type, fl->l_whence,
+				  fl->l_start, fl->l_len, wait);
+	      default:
+		errno = EINVAL;
+		return -1;
+	      }
 	  }
+
+	result = err ? __hurd_dfail (fd, err) : 0;
+	break;
       }
 
     case F_GETFL:		/* Get per-open flags.  */