Subject: linux-next: manual merge of the compat tree with the file-private-locks tree

From: Mark Brown <[email-masked]>
Date: Fri, 14 Mar 2014 17:06:37 +0000

Hi Heiko,

Today's linux-next merge of the compat tree got a conflict in fs/compat.c between commit 1ed1950c412f1b ("locks: add new fcntl cmd values for handling file private locks") from the file-private-locks tree and commit 932602e238329 ("fs/compat: convert to COMPAT_SYSCALL_DEFINE with changing parameter types") from the compat tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

diff --cc fs/compat.c
index 800914a1092a,19252b97f0cc..000000000000
--- a/fs/compat.c
+++ b/fs/compat.c
@@@ -399,23 -399,8 +399,23 @@@ static int put_compat_flock64(struct fl
  }
  #endif
  
 +static unsigned int
 +convert_fcntl_cmd(unsigned int cmd)
 +{
 +      switch (cmd) {
 +      case F_GETLK64:
 +              return F_GETLK;
 +      case F_SETLK64:
 +              return F_SETLK;
 +      case F_SETLKW64:
 +              return F_SETLKW;
 +      }
 +
 +      return cmd;
 +}
 +
- asmlinkage long compat_sys_fcntl64(unsigned int fd, unsigned int cmd,
-               unsigned long arg)
+ COMPAT_SYSCALL_DEFINE3(fcntl64, unsigned int, fd, unsigned int, cmd,
+                      compat_ulong_t, arg)
  {
        mm_segment_t old_fs;
        struct flock f;