* linux-next: manual merge of the compat tree with the file-private-locks tree
@ 2014-03-14 17:06 Mark Brown
0 siblings, 0 replies; only message in thread
From: Mark Brown @ 2014-03-14 17:06 UTC (permalink / raw)
To: Heiko Carstens, Jeff Layton; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]
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;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-03-14 17:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-14 17:06 linux-next: manual merge of the compat tree with the file-private-locks tree Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).