From: Mark Brown <broonie@kernel•org>
To: Heiko Carstens <heiko.carstens@de•ibm.com>,
Jeff Layton <jlayton@redhat•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the compat tree with the file-private-locks tree
Date: Fri, 14 Mar 2014 17:06:37 +0000 [thread overview]
Message-ID: <20140314170637.6370787172f6b7a78a5c2812@kernel.org> (raw)
[-- 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 --]
reply other threads:[~2014-03-14 17:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140314170637.6370787172f6b7a78a5c2812@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=jlayton@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox