From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Jeff Layton <jlayton@poochiereds•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Benjamin Coddington <bcodding@redhat•com>,
Dominique Martinet <dominique.martinet@cea•fr>
Subject: linux-next: manual merge of the akpm-current tree with the file-locks tree
Date: Mon, 2 Nov 2015 02:43:13 +1100 [thread overview]
Message-ID: <20151102024313.6198dc83@canb.auug.org.au> (raw)
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/9p/vfs_file.c
between commit:
4f6563677ae8 ("Move locks API users to locks_lock_inode_wait()")
from the file-locks tree and commit:
4c3932157148 ("9p: do not overwrite return code when locking fails")
from the akpm-current tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc fs/9p/vfs_file.c
index f23fd86697ea,6b747394f6f5..000000000000
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@@ -231,7 -231,8 +231,8 @@@ out_unlock
if (res < 0 && fl->fl_type != F_UNLCK) {
fl_type = fl->fl_type;
fl->fl_type = F_UNLCK;
- res = locks_lock_file_wait(filp, fl);
+ /* Even if this fails we want to return the remote error */
- posix_lock_file_wait(filp, fl);
++ locks_lock_file_wait(filp, fl);
fl->fl_type = fl_type;
}
out:
reply other threads:[~2015-11-01 15:43 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=20151102024313.6198dc83@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=bcodding@redhat$(echo .)com \
--cc=dominique.martinet@cea$(echo .)fr \
--cc=jlayton@poochiereds$(echo .)net \
--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