On Wed, Nov 17, 2010 at 04:26:56PM +0100, Arnd Bergmann wrote: > 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@xxxxxxxx> > Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx> Acked-by: J. Bruce Fields <bfields@xxxxxxxxxx> I want to get rid of most of these callbacks, actually; but that can wait for the next merge window. --b. > Cc: linux-nfs@xxxxxxxxxxxxxxx > --- > 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 > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
