Return-Path: linux-nfs-owner@vger.kernel.org Received: from mail-qc0-f175.google.com ([209.85.216.175]:33190 "EHLO mail-qc0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754872AbaHNN5D (ORCPT ); Thu, 14 Aug 2014 09:57:03 -0400 Received: by mail-qc0-f175.google.com with SMTP id w7so1090294qcr.6 for ; Thu, 14 Aug 2014 06:57:01 -0700 (PDT) From: Jeff Layton Date: Thu, 14 Aug 2014 09:56:58 -0400 To: Joe Perches Cc: Christine Caulfield , David Teigland , "J. Bruce Fields" , cluster-devel@redhat.com, linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, Kinglong Mee Subject: Re: [PATCH] locks: Remove unused conf argument from lm_grant Message-ID: <20140814095658.1716c48e@tlielax.poochiereds.net> In-Reply-To: <1408024360-5177-1-git-send-email-jlayton@primarydata.com> References: <1408024360-5177-1-git-send-email-jlayton@primarydata.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-nfs-owner@vger.kernel.org List-ID: On Thu, 14 Aug 2014 09:52:40 -0400 Jeff Layton wrote: > From: Joe Perches > > This argument is always NULL so don't pass it around. > > Signed-off-by: Joe Perches > Signed-off-by: Jeff Layton > --- > fs/dlm/plock.c | 8 ++++---- > fs/lockd/svclock.c | 12 +++--------- > include/linux/fs.h | 2 +- > 3 files changed, 8 insertions(+), 14 deletions(-) > Joe, if this looks OK with you, I'll plan to merge this for v3.18. Kinglong, I've added this to my "locks-3.18" branch if you need something to base your nfsd conflock patches on: git://git.samba.org/jlayton/linux.git Thanks, -- Jeff Layton