All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
	"J. Bruce Fields" <bfields@fieldses.org>,
	linux-nfs@vger.kernel.org
Subject: [PATCH 4/7] BKL: remove references to lock_kernel from comments
Date: Wed, 17 Nov 2010 16:26:56 +0100	[thread overview]
Message-ID: <1290007619-5787-5-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1290007619-5787-1-git-send-email-arnd@arndb.de>

Lock_kernel is gone from the code, so the comments
should be updated, too. nfsd now uses lock_flocks
instead of lock_kernel to protect against posix
file locks.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: linux-nfs@vger.kernel.org
---
 fs/nfsd/nfs4state.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index f1e5ec6..36db9cc 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2254,7 +2254,7 @@ nfs4_file_downgrade(struct nfs4_file *fp, unsigned int share_access)
  * Spawn a thread to perform a recall on the delegation represented
  * by the lease (file_lock)
  *
- * Called from break_lease() with lock_kernel() held.
+ * Called from break_lease() with lock_flocks() held.
  * Note: we assume break_lease will only call this *once* for any given
  * lease.
  */
@@ -2278,7 +2278,7 @@ void nfsd_break_deleg_cb(struct file_lock *fl)
 	list_add_tail(&dp->dl_recall_lru, &del_recall_lru);
 	spin_unlock(&recall_lock);
 
-	/* only place dl_time is set. protected by lock_kernel*/
+	/* only place dl_time is set. protected by lock_flocks*/
 	dp->dl_time = get_seconds();
 
 	/*
@@ -2295,7 +2295,7 @@ void nfsd_break_deleg_cb(struct file_lock *fl)
 /*
  * The file_lock is being reapd.
  *
- * Called by locks_free_lock() with lock_kernel() held.
+ * Called by locks_free_lock() with lock_flocks() held.
  */
 static
 void nfsd_release_deleg_cb(struct file_lock *fl)
@@ -2310,7 +2310,7 @@ void nfsd_release_deleg_cb(struct file_lock *fl)
 }
 
 /*
- * Called from setlease() with lock_kernel() held
+ * Called from setlease() with lock_flocks() held
  */
 static
 int nfsd_same_client_deleg_cb(struct file_lock *onlist, struct file_lock *try)
-- 
1.7.1


  parent reply	other threads:[~2010-11-17 15:28 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-17 15:26 [PATCH 0/7] BKL removal follow-up Arnd Bergmann
2010-11-17 15:26 ` Arnd Bergmann
2010-11-17 15:26 ` [PATCH 1/7] staging/stradis: mark as "depends on BKL" Arnd Bergmann
2010-11-17 16:03   ` Greg KH
2010-11-17 15:26 ` [PATCH 2/7] drm/i810: remove the BKL Arnd Bergmann
2010-11-17 15:26   ` Arnd Bergmann
2010-11-17 15:26 ` [PATCH 3/7] BKL: remove extraneous #include <smp_lock.h> Arnd Bergmann
2010-11-17 15:26 ` Arnd Bergmann [this message]
2010-11-17 15:40   ` [PATCH 4/7] BKL: remove references to lock_kernel from comments J. Bruce Fields
2010-11-17 15:26 ` [PATCH 5/7] BKL: disable by default Arnd Bergmann
2010-11-17 15:26 ` [PATCH 6/7] BKL: mark lock_kernel as deprecated Arnd Bergmann
2010-11-17 15:26 ` [PATCH 7/7] BKL: move CONFIG_BKL to staging Arnd Bergmann
2010-11-18 23:34 ` [PATCH 0/7] BKL removal follow-up Jan Kara
2010-11-18 23:40   ` Linus Torvalds
2010-11-18 23:40     ` Linus Torvalds
2010-11-21 14:12     ` Boaz Harrosh
2010-11-21 14:12       ` Boaz Harrosh
2010-11-21 17:45       ` Linus Torvalds
2010-11-21 17:45         ` Linus Torvalds
2010-11-22 15:17         ` Nick Bowler
2010-12-21 22:54           ` Arnd Bergmann
2010-12-22 15:23             ` Nick Bowler
2010-12-24 11:04             ` Evgeniy Dushistov
2010-12-30 14:58               ` Arnd Bergmann
2010-12-30 15:16                 ` Evgeniy Dushistov

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=1290007619-5787-5-git-send-email-arnd@arndb.de \
    --to=arnd@arndb.de \
    --cc=bfields@fieldses.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=torvalds@linux-foundation.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.