Return-Path: linux-nfs-owner@vger.kernel.org
Received: from bombadil.infradead.org ([198.137.202.9]:45719 "EHLO
	bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751105AbbAIOb4 (ORCPT
	<rfc822;linux-nfs@vger.kernel.org>); Fri, 9 Jan 2015 09:31:56 -0500
Date: Fri, 9 Jan 2015 06:31:55 -0800
From: Christoph Hellwig <hch@infradead.org>
To: Jeff Layton <jlayton@primarydata.com>
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org,
        ceph-devel@vger.kernel.org, hch@infradead.org
Subject: Re: [PATCH v2 04/10] locks: move flock locks to file_lock_context
Message-ID: <20150109143155.GB30294@infradead.org>
References: <1420742065-28423-1-git-send-email-jlayton@primarydata.com>
 <1420742065-28423-5-git-send-email-jlayton@primarydata.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
In-Reply-To: <1420742065-28423-5-git-send-email-jlayton@primarydata.com>
Sender: linux-nfs-owner@vger.kernel.org
List-ID: <linux-nfs.vger.kernel.org>

>  void ceph_count_locks(struct inode *inode, int *fcntl_count, int *flock_count)
>  {
>  	struct file_lock *lock;
> +	struct file_lock_context *ctx;
>  
>  	*fcntl_count = 0;
>  	*flock_count = 0;
>  
> +	spin_lock(&inode->i_lock);

Seems like moving the locking around is unrelated to this patch.

> +	list_for_each_entry(fl, &flctx->flc_flock, fl_list) {
> +		if (nfs_file_open_context(fl->fl_file)->state != state)
> +			continue;
> +		spin_unlock(&inode->i_lock);
> +		status = ops->recover_lock(state, fl);
> +		switch (status) {
> +			case 0:
> +				break;
> +			case -ESTALE:
> +			case -NFS4ERR_ADMIN_REVOKED:
> +			case -NFS4ERR_STALE_STATEID:
> +			case -NFS4ERR_BAD_STATEID:
> +			case -NFS4ERR_EXPIRED:
> +			case -NFS4ERR_NO_GRACE:
> +			case -NFS4ERR_STALE_CLIENTID:
> +			case -NFS4ERR_BADSESSION:
> +			case -NFS4ERR_BADSLOT:
> +			case -NFS4ERR_BAD_HIGH_SLOT:
> +			case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION:
> +				goto out;
> +			default:
> +				printk(KERN_ERR "NFS: %s: unhandled error %d\n",
> +					 __func__, status);
> +			case -ENOMEM:
> +			case -NFS4ERR_DENIED:
> +			case -NFS4ERR_RECLAIM_BAD:
> +			case -NFS4ERR_RECLAIM_CONFLICT:
> +				/* kill_proc(fl->fl_pid, SIGLOST, 1); */
> +				status = 0;
> +		}

Instead of duplicating this huge body of code it seems like a good idea
to add a preparatory patch to factor it out into a helper function.

> +static bool
> +is_whole_file_wrlock(struct file_lock *fl)
> +{
> +	return fl->fl_start == 0 && fl->fl_end == OFFSET_MAX && fl->fl_type == F_WRLCK;
> +}

Please break this into multiple lines to stay under 80 characters.