From mboxrd@z Thu Jan 1 00:00:00 1970 From: "David M. Richter" Subject: [PATCH 1/4] leases: fix a return-value mixup Date: Wed, 23 Apr 2008 16:28:59 -0400 Message-ID: <1208982542-18277-1-git-send-email-richterd@citi.umich.edu> Cc: linux-fsdevel@vger.kernel.org, "David M. Richter" To: Bruce Fields Return-path: Received: from citi.umich.edu ([141.211.133.111]:43023 "EHLO citi.umich.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751529AbYDWU3F (ORCPT ); Wed, 23 Apr 2008 16:29:05 -0400 Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Fixes a return-value mixup from 85c59580b30c82aa771aa33b37217a6b6851bc14 "locks: Fix potential OOPS in generic_setlease()", in which -ENOMEM replaced what had been intended to stay -EAGAIN in the variable "error". Signed-off-by: David M. Richter --- fs/locks.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/fs/locks.c b/fs/locks.c index 592faad..b9f3a0b 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1404,6 +1404,7 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp) rdlease_count++; } + error = -EAGAIN; if ((arg == F_RDLCK && (wrlease_count > 0)) || (arg == F_WRLCK && ((rdlease_count + wrlease_count) > 0))) goto out; -- 1.5.4