Return-Path: linux-nfs-owner@vger.kernel.org Received: from bombadil.infradead.org ([198.137.202.9]:38154 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751699Ab3KRNHr (ORCPT ); Mon, 18 Nov 2013 08:07:47 -0500 Date: Mon, 18 Nov 2013 05:07:47 -0800 From: Christoph Hellwig To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH 2/2] nfsd: make sure to balance get/put_write_access Message-ID: <20131118130747.GB17184@infradead.org> References: <20131118130730.GA17184@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20131118130730.GA17184@infradead.org> Sender: linux-nfs-owner@vger.kernel.org List-ID: Use a straight goto error label style in nfsd_setattr to make sure we always do the put_write_access call after we got it earlier. Signed-off-by: Christoph Hellwig --- fs/nfsd/vfs.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) Index: linux/fs/nfsd/vfs.c =================================================================== --- linux.orig/fs/nfsd/vfs.c 2013-11-18 11:45:09.971804080 +0100 +++ linux/fs/nfsd/vfs.c 2013-11-18 14:04:55.003632006 +0100 @@ -444,27 +444,28 @@ nfsd_setattr(struct svc_rqst *rqstp, str iap->ia_valid |= ATTR_CTIME; - err = nfserr_notsync; - if (!check_guard || guardtime == inode->i_ctime.tv_sec) { - host_err = nfsd_break_lease(inode); - if (host_err) - goto out_nfserr; - fh_lock(fhp); - - host_err = notify_change(dentry, iap, NULL); - err = nfserrno(host_err); - fh_unlock(fhp); + if (check_guard && guardtime != inode->i_ctime.tv_sec) { + err = nfserr_notsync; + goto out_put_write_access; } + + host_err = nfsd_break_lease(inode); + if (host_err) + goto out_put_write_access_nfserror; + + fh_lock(fhp); + host_err = notify_change(dentry, iap, NULL); + fh_unlock(fhp); + +out_put_write_access_nfserror: + err = nfserrno(host_err); +out_put_write_access: if (size_change) put_write_access(inode); if (!err) commit_metadata(fhp); out: return err; - -out_nfserr: - err = nfserrno(host_err); - goto out; } #if defined(CONFIG_NFSD_V2_ACL) || \