From: "J. Bruce Fields" <bfields@redhat.com>
To: linux-nfs@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, "J. Bruce Fields" <bfields@redhat.com>
Subject: [PATCH 4/4] locks: minor setlease cleanup
Date: Mon, 3 Jan 2011 22:06:59 -0500 [thread overview]
Message-ID: <1294110419-3105-5-git-send-email-bfields@redhat.com> (raw)
In-Reply-To: <1294110419-3105-1-git-send-email-bfields@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---
fs/locks.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/locks.c b/fs/locks.c
index 5cb6506..feaac63 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1399,7 +1399,7 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp)
for (before = &inode->i_flock;
((fl = *before) != NULL) && IS_LEASE(fl);
before = &fl->fl_next) {
- if (fl->fl_file == lease->fl_file)
+ if (fl->fl_file == filp)
my_before = before;
else if (fl->fl_type == (F_INPROGRESS | F_UNLCK))
/*
--
1.7.1
prev parent reply other threads:[~2011-01-04 3:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-04 3:06 remove lease callbacks J. Bruce Fields
2011-01-04 3:06 ` [PATCH 1/4] nfsd4: eliminate lease delete callback J. Bruce Fields
2011-01-04 3:06 ` J. Bruce Fields
2011-01-04 3:06 ` [PATCH 2/4] nfsd4: use a single struct file for delegations J. Bruce Fields
2011-01-04 3:06 ` [PATCH 3/4] locks: eliminate fl_mylease callback J. Bruce Fields
2011-01-04 6:07 ` Christoph Hellwig
2011-01-04 18:18 ` J. Bruce Fields
2011-01-07 13:40 ` Christoph Hellwig
2011-01-09 19:55 ` J. Bruce Fields
2011-01-09 19:55 ` J. Bruce Fields
2011-01-09 20:08 ` Christoph Hellwig
2011-01-09 20:08 ` Christoph Hellwig
2011-01-04 3:06 ` J. Bruce Fields [this message]
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=1294110419-3105-5-git-send-email-bfields@redhat.com \
--to=bfields@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.