From 4107fcf517c39307b3ee14f39be303c3878922ef Mon Sep 17 00:00:00 2001
From: Bob Peterson <rpeterso@redhat.com>
Date: Wed, 11 Apr 2012 12:56:41 -0400
Subject: [PATCH] --- yaml --- r: 302687 b: refs/heads/master c:
 df3fd117f98029eaf88c71dea770a1f8eacbfb99 h: refs/heads/master i:   302685:
 bad52d999cc7edc6d26866b87e0d2d26804feb2e   302683:
 21798afebe4cdae723e74017fa9dd52eb9cbcfb7   302679:
 8ad52a91a4c67608946b764af78136554af1fc49   302671:
 115eb089f2da37e43d6085320fb083a1fe2db1a0   302655:
 c25874a94030bd56e084d419d54b71fcf3ba30d5 v: v3

---
 [refs]               |  2 +-
 trunk/fs/gfs2/file.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index a4e2fc5758d0..2dd118504f1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14e5f1848dcaed611e7dadfaa0d593a4a1b93010
+refs/heads/master: df3fd117f98029eaf88c71dea770a1f8eacbfb99
diff --git a/trunk/fs/gfs2/file.c b/trunk/fs/gfs2/file.c
index a3d2c9ee8d66..31b199f6efc1 100644
--- a/trunk/fs/gfs2/file.c
+++ b/trunk/fs/gfs2/file.c
@@ -558,14 +558,14 @@ static int gfs2_open(struct inode *inode, struct file *file)
 }
 
 /**
- * gfs2_close - called to close a struct file
+ * gfs2_release - called to close a struct file
  * @inode: the inode the struct file belongs to
  * @file: the struct file being closed
  *
  * Returns: errno
  */
 
-static int gfs2_close(struct inode *inode, struct file *file)
+static int gfs2_release(struct inode *inode, struct file *file)
 {
 	struct gfs2_sbd *sdp = inode->i_sb->s_fs_info;
 	struct gfs2_file *fp;
@@ -1005,7 +1005,7 @@ const struct file_operations gfs2_file_fops = {
 	.unlocked_ioctl	= gfs2_ioctl,
 	.mmap		= gfs2_mmap,
 	.open		= gfs2_open,
-	.release	= gfs2_close,
+	.release	= gfs2_release,
 	.fsync		= gfs2_fsync,
 	.lock		= gfs2_lock,
 	.flock		= gfs2_flock,
@@ -1019,7 +1019,7 @@ const struct file_operations gfs2_dir_fops = {
 	.readdir	= gfs2_readdir,
 	.unlocked_ioctl	= gfs2_ioctl,
 	.open		= gfs2_open,
-	.release	= gfs2_close,
+	.release	= gfs2_release,
 	.fsync		= gfs2_fsync,
 	.lock		= gfs2_lock,
 	.flock		= gfs2_flock,
@@ -1037,7 +1037,7 @@ const struct file_operations gfs2_file_fops_nolock = {
 	.unlocked_ioctl	= gfs2_ioctl,
 	.mmap		= gfs2_mmap,
 	.open		= gfs2_open,
-	.release	= gfs2_close,
+	.release	= gfs2_release,
 	.fsync		= gfs2_fsync,
 	.splice_read	= generic_file_splice_read,
 	.splice_write	= generic_file_splice_write,
@@ -1049,7 +1049,7 @@ const struct file_operations gfs2_dir_fops_nolock = {
 	.readdir	= gfs2_readdir,
 	.unlocked_ioctl	= gfs2_ioctl,
 	.open		= gfs2_open,
-	.release	= gfs2_close,
+	.release	= gfs2_release,
 	.fsync		= gfs2_fsync,
 	.llseek		= default_llseek,
 };