Return-Path: linux-nfs-owner@vger.kernel.org Received: from mail-ig0-f173.google.com ([209.85.213.173]:51374 "EHLO mail-ig0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754713AbaIDSZg (ORCPT ); Thu, 4 Sep 2014 14:25:36 -0400 MIME-Version: 1.0 In-Reply-To: <20140904084938.2664bf0a@tlielax.poochiereds.net> References: <1409834323-7171-1-git-send-email-jlayton@primarydata.com> <1409834323-7171-2-git-send-email-jlayton@primarydata.com> <20140904084938.2664bf0a@tlielax.poochiereds.net> Date: Thu, 4 Sep 2014 14:25:35 -0400 Message-ID: Subject: Re: [PATCH v2 01/17] locks: consolidate "nolease" routines From: Trond Myklebust To: Jeff Layton Cc: Devel FS Linux , Linux NFS Mailing List , Christoph Hellwig , "J. Bruce Fields" , Linux Kernel mailing list , Steven Whitehouse , cluster-devel Content-Type: text/plain; charset=UTF-8 Sender: linux-nfs-owner@vger.kernel.org List-ID: On Thu, Sep 4, 2014 at 8:49 AM, Jeff Layton wrote: > On Thu, 4 Sep 2014 08:41:51 -0400 > Trond Myklebust wrote: > >> On Thu, Sep 4, 2014 at 8:38 AM, Jeff Layton wrote: >> > GFS2 and NFS have setlease routines that always just return -EINVAL. >> > Turn that into a generic routine that can live in fs/libfs.c. >> > >> > Cc: Trond Myklebust >> > Cc: >> > Cc: Steven Whitehouse >> > Cc: >> > Signed-off-by: Jeff Layton >> > --- >> > fs/gfs2/file.c | 22 +--------------------- >> > fs/libfs.c | 16 ++++++++++++++++ >> > fs/nfs/file.c | 13 +------------ >> > fs/nfs/internal.h | 1 - >> > fs/nfs/nfs4file.c | 2 +- >> > include/linux/fs.h | 1 + >> > 6 files changed, 20 insertions(+), 35 deletions(-) >> >> Acked-by: Trond Myklebust >> > > Thanks. While spinning this up, I did have a momentary pause to wonder > if -ENOLCK would be a better return value here. > > It would make it easier to distinguish this from from "oops, I passed > in bogus arguments". For now, I'll leave it as -EINVAL, but it's > something to consider... > Actually, it looks as if when you compile with !CONFIG_FILE_LOCKING, then fcntl_setlease() returns the value '0' (which would be "success!"). The word "confusing" only begins to describe it all. Cheers Trond