aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/ops_file.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-07-31 15:42:17 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-07-31 15:42:17 -0400
commit420b9e5e45d33355471c8d2d593bb0e5d6c77421 (patch)
tree7e5e76972606c0c597e0609e65b0478b15ae64c4 /fs/gfs2/ops_file.c
parentb1b934d31d8a608fe69fc56d6e539548b55b0601 (diff)
[GFS2] Tidy up in various files
Tidy up some files and remove an unused routine in meta_io.h. Also added a bit of extra debugging in meta_io.h. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/ops_file.c')
-rw-r--r--fs/gfs2/ops_file.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index d13e04e8a96a..145a29fa4ea4 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -597,13 +597,11 @@ static int gfs2_open(struct inode *inode, struct file *file)
597 597
598 return 0; 598 return 0;
599 599
600 fail_gunlock: 600fail_gunlock:
601 gfs2_glock_dq_uninit(&i_gh); 601 gfs2_glock_dq_uninit(&i_gh);
602 602fail:
603 fail:
604 file->private_data = NULL; 603 file->private_data = NULL;
605 kfree(fp); 604 kfree(fp);
606
607 return error; 605 return error;
608} 606}
609 607
@@ -736,9 +734,8 @@ static int do_flock(struct file *file, int cmd, struct file_lock *fl)
736 gfs2_assert_warn(GFS2_SB(&ip->i_inode), !error); 734 gfs2_assert_warn(GFS2_SB(&ip->i_inode), !error);
737 } 735 }
738 736
739 out: 737out:
740 mutex_unlock(&fp->f_fl_mutex); 738 mutex_unlock(&fp->f_fl_mutex);
741
742 return error; 739 return error;
743} 740}
744 741