From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Josef 'Jeff' Sipek" Subject: [PATCH 16/32] Unionfs: minor file_release updates Date: Sun, 2 Sep 2007 22:20:39 -0400 Message-ID: <11887860572220-git-send-email-jsipek@cs.sunysb.edu> References: <1188786055371-git-send-email-jsipek@cs.sunysb.edu> Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, hch@infradead.org, viro@ftp.linux.org.uk, bharata@linux.vnet.ibm.com, j.blunck@tu-harburg.de, Erez Zadok , "Josef 'Jeff' Sipek" To: akpm@linux-foundation.org Return-path: Received: from filer.fsl.cs.sunysb.edu ([130.245.126.2]:57580 "EHLO filer.fsl.cs.sunysb.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753165AbXICCYU (ORCPT ); Sun, 2 Sep 2007 22:24:20 -0400 In-Reply-To: <1188786055371-git-send-email-jsipek@cs.sunysb.edu> Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org From: Erez Zadok Signed-off-by: Erez Zadok Signed-off-by: Josef 'Jeff' Sipek --- fs/unionfs/commonfops.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c index 612207a..1050c49 100644 --- a/fs/unionfs/commonfops.c +++ b/fs/unionfs/commonfops.c @@ -593,8 +593,7 @@ int unionfs_file_release(struct inode *inode, struct file *file) struct unionfs_inode_info *inodeinfo; struct super_block *sb = inode->i_sb; int bindex, bstart, bend; - int fgen; - int err; + int fgen, err = 0; unionfs_read_lock(sb); /* @@ -618,7 +617,7 @@ int unionfs_file_release(struct inode *inode, struct file *file) if (lower_file) { fput(lower_file); - branchput(inode->i_sb, bindex); + branchput(sb, bindex); } } kfree(fileinfo->lower_files); @@ -640,6 +639,7 @@ int unionfs_file_release(struct inode *inode, struct file *file) fileinfo->rdstate = NULL; } kfree(fileinfo); + out: unionfs_read_unlock(sb); return err; -- 1.5.2.2.238.g7cbf2f2