From: J. Bruce Fields <bfields@citi.umich.edu>
Date: Mon, 7 Apr 2008 17:05:27 +0000 (-0400)
Subject: lockd: Fix stale nlmsvc_unlink_block comment
X-Git-Tag: v2.6.26-rc1~1083^2~12
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3c61eecb607dbc2777074b1a95b8a97e31a96a73;p=linux-2.6-omap-h63xx.git

lockd: Fix stale nlmsvc_unlink_block comment

As of 5996a298da43a03081e9ba2116983d173001c862 ("NLM: don't unlock on
cancel requests") we no longer unlock in this case, so the comment is no
longer accurate.

Thanks to Stuart Friedberg for pointing out the inconsistency.

Cc: Stuart Friedberg <sfriedberg@hp.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
---

diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index 4da7c4c2706..1f122c1940a 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -227,8 +227,7 @@ failed:
 }
 
 /*
- * Delete a block. If the lock was cancelled or the grant callback
- * failed, unlock is set to 1.
+ * Delete a block.
  * It is the caller's responsibility to check whether the file
  * can be closed hereafter.
  */