From 7b75dbb419a487a7d5867ad6ab670fbace7ac09b Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Wed, 3 Jun 2009 10:07:44 +0100
Subject: [PATCH] --- yaml --- r: 146933 b: refs/heads/master c:
 e09f9446b94ac64b27d37e98c1110f29d712cdad h: refs/heads/master i:   146931:
 a9357d467704f26650bf3f96eb331b9e01cc8673 v: v3

---
 [refs]               | 2 +-
 trunk/fs/gfs2/file.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5250ea2f241a..35e69f9acb49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a12af1ebe675e85831fde3c4d0908fc3b0908b7a
+refs/heads/master: e09f9446b94ac64b27d37e98c1110f29d712cdad
diff --git a/trunk/fs/gfs2/file.c b/trunk/fs/gfs2/file.c
index 841ddc979388..73318a3ce6f1 100644
--- a/trunk/fs/gfs2/file.c
+++ b/trunk/fs/gfs2/file.c
@@ -694,8 +694,6 @@ static void do_unflock(struct file *file, struct file_lock *fl)
 
 static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl)
 {
-	struct gfs2_inode *ip = GFS2_I(file->f_mapping->host);
-
 	if (!(fl->fl_flags & FL_FLOCK))
 		return -ENOLCK;
 	if (fl->fl_type & LOCK_MAND)