From f064d1bd6672f29c55d75a06ff39e81a9ac632dd Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <miklos@szeredi.hu>
Date: Tue, 17 Oct 2006 00:10:09 -0700
Subject: [PATCH] --- yaml --- r: 39732 b: refs/heads/master c:
 265126ba9e1f8e217e61d1017c6609f76828aa7a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index eafbd591434c..58f84e5e7e97 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8da5ff23ce0a84d9845b01e6fe5047e17836bf5a
+refs/heads/master: 265126ba9e1f8e217e61d1017c6609f76828aa7a
diff --git a/trunk/fs/fuse/inode.c b/trunk/fs/fuse/inode.c
index e9114237f31f..4ee8f72e6380 100644
--- a/trunk/fs/fuse/inode.c
+++ b/trunk/fs/fuse/inode.c
@@ -172,7 +172,6 @@ struct inode *fuse_iget(struct super_block *sb, unsigned long nodeid,
 	struct inode *inode;
 	struct fuse_inode *fi;
 	struct fuse_conn *fc = get_fuse_conn_super(sb);
-	int retried = 0;
 
  retry:
 	inode = iget5_locked(sb, nodeid, fuse_inode_eq, fuse_inode_set, &nodeid);
@@ -186,11 +185,9 @@ struct inode *fuse_iget(struct super_block *sb, unsigned long nodeid,
 		fuse_init_inode(inode, attr);
 		unlock_new_inode(inode);
 	} else if ((inode->i_mode ^ attr->mode) & S_IFMT) {
-		BUG_ON(retried);
 		/* Inode has changed type, any I/O on the old should fail */
 		make_bad_inode(inode);
 		iput(inode);
-		retried = 1;
 		goto retry;
 	}