diff options
| author | Steven Whitehouse | 2006-07-31 21:42:17 +0200 |
|---|---|---|
| committer | Steven Whitehouse | 2006-07-31 21:42:17 +0200 |
| commit | 420b9e5e45d33355471c8d2d593bb0e5d6c77421 (patch) | |
| tree | 7e5e76972606c0c597e0609e65b0478b15ae64c4 /fs/gfs2/ops_file.c | |
| parent | Merge branch 'master' (diff) | |
| download | kernel-qcow2-linux-420b9e5e45d33355471c8d2d593bb0e5d6c77421.tar.gz kernel-qcow2-linux-420b9e5e45d33355471c8d2d593bb0e5d6c77421.tar.xz kernel-qcow2-linux-420b9e5e45d33355471c8d2d593bb0e5d6c77421.zip | |
[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.c | 9 |
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) return 0; - fail_gunlock: +fail_gunlock: gfs2_glock_dq_uninit(&i_gh); - - fail: +fail: file->private_data = NULL; kfree(fp); - return error; } @@ -736,9 +734,8 @@ static int do_flock(struct file *file, int cmd, struct file_lock *fl) gfs2_assert_warn(GFS2_SB(&ip->i_inode), !error); } - out: +out: mutex_unlock(&fp->f_fl_mutex); - return error; } |