From: Alexey Dobriyan <adobriyan@sw.ru>
To: akpm@osdl.org, kamalesh@linux.vnet.ibm.com
Cc: linux-kernel@vger.kernel.org, xemul@sw.ru
Subject: 2.6.23-rc7-mm1: fix generic_setlease() mismerge
Date: Mon, 24 Sep 2007 17:09:57 +0400 [thread overview]
Message-ID: <20070924130957.GE6757@localhost.sw.ru> (raw)
Please, try this:
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1373,11 +1373,6 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp)
if (new_fl == NULL)
goto out;
- error = -ENOMEM;
- new_fl = locks_alloc_lock();
- if (new_fl == NULL)
- goto out;
-
/*
* At this point, we know that if there is an exclusive
* lease on this file, then we hold it on this filp
reply other threads:[~2007-09-24 13:12 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=20070924130957.GE6757@localhost.sw.ru \
--to=adobriyan@sw.ru \
--cc=akpm@osdl.org \
--cc=kamalesh@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=xemul@sw.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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