summaryrefslogtreecommitdiff
path: root/fs/gfs2/ops_file.c
diff options
context:
space:
mode:
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)
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;
}