Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp10194427ybl; Thu, 26 Dec 2019 12:38:48 -0800 (PST) X-Google-Smtp-Source: APXvYqxn88mfMoijhEDLefRVL+SGYI0Djrb/ldTRoGFzSRWDJp+4TRbmqVycSOG/5dZcEuLwddqA X-Received: by 2002:a9d:6c01:: with SMTP id f1mr49823401otq.133.1577392728145; Thu, 26 Dec 2019 12:38:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577392728; cv=none; d=google.com; s=arc-20160816; b=tg2+aF42NjhBgJHFW5X0cRX5kTLJMvnT/Wjz/AizlGNBKV6u//+RPh7ixpo/j3LWDi vzvONUWCZ9te5SFbnjNvBCRYmnfrBG9T8BjvzGZUIPyqUG3rEPG9PirfT0dHdeGXwYkv sR3Fup1FdKoKr/6e+Z7cHrLqLPuT94JTUOP89iyDbj2/TYjQtLW7LC8JVwR9NBfsPISn xmZggkGx2HK/Jr9T/FJKCYmCU5eMYG+5dCtGWmpjhzPfn92NpWFZ1T9GGKvDISL/r35H aaq5GswU423BP0kstivxvdZQVq6DPK4fcxsTbBP5dmXz6wguWp42pzoY8pMtEhRIA7O8 U+Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=HImTIUDKCkz90/mVqDadf//lbgFZThYHx2fxEWAm4HE=; b=izL4+YyJAaNmAqO/zQw5JEYY/NVN/C+KTsVPPPYOYzLyREbzBbZC7wtJ7yK0HQmZvj cKHfH+3Bq44SgEIPBo27L3ZUj5FN8P2LZ76peXobIA5ShRJ7OVHBv0YOdhXuAUT/j+cB DUbz+RUviMB9in6FPly0xq14LxChBLhKnEkNZQI23snKog8xEa+LcdzvqqSA10Baia6U DqRuR+7bY46MGI8uxUUduHOe8QYrzhMZlQbbuYXe4IfleEIkKb11ebn2U/ox+gilU5t1 WQNnEPy+8h3LQqCD5YrYHvxcVJIgN+buLrlJJw9l244gA9BE00A7E1P/1CnwoNk1AX0a iyMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@umn.edu header.s=google header.b=ntRYZFTw; spf=pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=umn.edu Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g9si15948930otq.68.2019.12.26.12.38.23; Thu, 26 Dec 2019 12:38:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@umn.edu header.s=google header.b=ntRYZFTw; spf=pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=umn.edu Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727071AbfLZUhi (ORCPT + 99 others); Thu, 26 Dec 2019 15:37:38 -0500 Received: from mta-p8.oit.umn.edu ([134.84.196.208]:47794 "EHLO mta-p8.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727040AbfLZUhi (ORCPT ); Thu, 26 Dec 2019 15:37:38 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-p8.oit.umn.edu (Postfix) with ESMTP id 47kMG90FBdz9wK06 for ; Thu, 26 Dec 2019 20:37:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p8.oit.umn.edu ([127.0.0.1]) by localhost (mta-p8.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0WuygrQ9pH0q for ; Thu, 26 Dec 2019 14:37:36 -0600 (CST) Received: from mail-yb1-f199.google.com (mail-yb1-f199.google.com [209.85.219.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p8.oit.umn.edu (Postfix) with ESMTPS id 47kMG86NhQz9wK02 for ; Thu, 26 Dec 2019 14:37:36 -0600 (CST) Received: by mail-yb1-f199.google.com with SMTP id d131so19799379ybb.9 for ; Thu, 26 Dec 2019 12:37:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=HImTIUDKCkz90/mVqDadf//lbgFZThYHx2fxEWAm4HE=; b=ntRYZFTwgt+z1MZhyPlGfNMPLcxw29JgS0WhPgImNkqaBbFTC1vOGk7K1oK669JK7+ RM5f0Ij/xY/9H40Bz+uHIC9x3IU8wAB6weVq9ayqxNWVeOoEMTGBb9Bzo4ukPCNXGYtX 2nBwS+0PmrB0Y58rQrQzr0mnQTDSqySqmfx5wrqy0Nfn7a3NZu9v+4a+DRbR1HBU+tjY k5HyTZ6umwEaA0Yjrkqal4bqG0pmNPL70+batjcNnnCHq+MB+1e+9cRveq6aO3Jme/Bv oM6uP2mcJn3qMyEWDFcYDxBBBdSnGxJqg9fJAyoqWgrAXSPR1tP7adiPTb6Voa6D7kw2 S2sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=HImTIUDKCkz90/mVqDadf//lbgFZThYHx2fxEWAm4HE=; b=QbCXC02kqfdCbyZ+d3/WRKkj+2jCVTMINLoGuY46Q7z7oVbqsn1eFYH22DKWp8bATT 7SjPWAJKr59GJlxrVCOgDhhgvFJPmhyEpXLdTe+AqSBFxui2KaNhDEVK3KkhXkKZRHNc 6ETDhNpnq6Gg9tTyYRwcfu9ErVhly1hzxZsUicAZKTdXzgszBF+FvhLRaG8E9nULHNRj IcfNhrpGSPNcjsRvIqpSfyQZybRZlzMROmfveult2c5sHBlPrEBlUpg4wlHNsp7fzifO dgifb+Yf4poIP5ZjHdaSHgHAJIGRy10dMX6MgnGbjbDrCgyJ13uGHv7lJxwnjvcQbEJM FfXA== X-Gm-Message-State: APjAAAXZaL0NLZIAA8zY0GNm1YKveKyvby595htGEspub409cuUt9nco 19KmcRAIFgSjGw5yrcKhencOnJaPILlHzzjSaaVCydtrP5cCDQb8MBoInaYak/ZOYdlQtFDb2mO rKtLOVVXrQYrJQ6D+exVIxAHE X-Received: by 2002:a81:6fd4:: with SMTP id k203mr34295347ywc.370.1577392656417; Thu, 26 Dec 2019 12:37:36 -0800 (PST) X-Received: by 2002:a81:6fd4:: with SMTP id k203mr34295336ywc.370.1577392656189; Thu, 26 Dec 2019 12:37:36 -0800 (PST) Received: from cs-u-syssec1.dtc.umn.edu (cs-u-syssec1.cs.umn.edu. [128.101.106.66]) by smtp.gmail.com with ESMTPSA id w74sm12621083ywa.71.2019.12.26.12.37.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Dec 2019 12:37:35 -0800 (PST) From: Aditya Pakki To: pakki001@umn.edu Cc: kjlu@umn.edu, "J. Bruce Fields" , Chuck Lever , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] nfsd: remove unnecessary assertion in nfsd4_layout_setlease Date: Thu, 26 Dec 2019 14:37:33 -0600 Message-Id: <20191226203733.27808-1-pakki001@umn.edu> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org In nfsd4_layout_setlease, checking for a valid file lock is redundant and can be removed. This patch eliminates such a BUG_ON check. Signed-off-by: Aditya Pakki --- fs/nfsd/nfs4layouts.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c index 2681c70283ce..ef5f8e645f4f 100644 --- a/fs/nfsd/nfs4layouts.c +++ b/fs/nfsd/nfs4layouts.c @@ -204,7 +204,6 @@ nfsd4_layout_setlease(struct nfs4_layout_stateid *ls) locks_free_lock(fl); return status; } - BUG_ON(fl != NULL); return 0; } -- 2.20.1