There shouldn't actually be any requests to cancel, so the request will fail anyway. Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxxxxxx> --- fs/lockd/svclock.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 9539535..1436ac2 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -591,10 +591,6 @@ nlmsvc_cancel_blocked(struct nlm_file *file, struct nlm_lock *lock) (long long)lock->fl.fl_start, (long long)lock->fl.fl_end); - /* XXX: ? */ - if (locks_in_grace()) - return nlm_lck_denied_grace_period; - mutex_lock(&file->f_mutex); block = nlmsvc_lookup_block(file, lock); mutex_unlock(&file->f_mutex); -- 1.5.5.rc1 -- 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
