@@ -107,6 +107,15 @@ struct inode *coda_cnode_make(struct CodaFid *fid, struct super_block *sb)
}
+static void coda_reset_inode(struct inode *inode, unsigned long hash, void *data)
+{
+ struct CodaFid *fid = (struct CodaFid *)data;
+ struct coda_inode_info *cii = ITOC(inode);
+
+ cii->c_fid = *fid;
+ inode->i_ino = hash;
+}
+
/* Although we treat Coda file identifiers as immutable, there is one
* special case for files created during a disconnection where they may
* not be globally unique. When an identifier collision is detected we
@@ -123,6 +132,8 @@ void coda_replace_fid(struct inode *inode, struct CodaFid *oldfid,
BUG_ON(!coda_fideq(&cii->c_fid, oldfid));
+ rehash_inode(inode, hash, coda_reset_inode, newfid);
+
/* replace fid and rehash inode */
/* XXX we probably need to hold some lock here! */
remove_inode_hash(inode);
@@ -501,6 +501,29 @@ void __remove_inode_hash(struct inode *inode)
}
EXPORT_SYMBOL(__remove_inode_hash);
+/**
+ * rehash_inode - Relabel and rehash an inode
+ * @inode: Inode to rehash
+ * @hashval: New hash value (usually inode number) to get
+ * @reset: Callback used to relabel the inode
+ * @data: Opaque data pointer to pass to @reset
+ */
+void rehash_inode(struct inode *inode, unsigned long hashval,
+ void (*reset)(struct inode *inode, unsigned long hashval, void *data),
+ void *data)
+{
+ struct hlist_head *b = inode_hashtable + hash(inode->i_sb, hashval);
+
+ spin_lock(&inode_hash_lock);
+ spin_lock(&inode->i_lock);
+ hlist_del_init(&inode->i_hash);
+ reset(inode, hashval, data);
+ hlist_add_head(&inode->i_hash, b);
+ spin_unlock(&inode->i_lock);
+ spin_unlock(&inode_hash_lock);
+}
+EXPORT_SYMBOL(rehash_inode);
+
void clear_inode(struct inode *inode)
{
/*
@@ -3020,6 +3020,9 @@ static inline void remove_inode_hash(struct inode *inode)
__remove_inode_hash(inode);
}
+extern void rehash_inode(struct inode *, unsigned long,
+ void (*reset)(struct inode *, unsigned long, void *), void *);
+
extern void inode_sb_list_add(struct inode *inode);
#ifdef CONFIG_BLOCK
When coda attempts to recover from disconnected operation, there exists the possibility of an file created during disconnected operation not being creatable on the server with the same file identifier (FID). In such a case, coda_replace_fid() has to rehash the inode and move it between chains - but, as the comment notes, this really needs some locking. Fix this by moving the core part of the code to fs/inode.c and providing it with a set() function akin to iget5(). We can then take the inode cache lock whilst performing the move. Reported-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David Howells <dhowells@redhat.com> cc: Jan Harkes <jaharkes@cs.cmu.edu> cc: coda@cs.cmu.edu cc: codalist@coda.cs.cmu.edu --- fs/coda/cnode.c | 11 +++++++++++ fs/inode.c | 23 +++++++++++++++++++++++ include/linux/fs.h | 3 +++ 3 files changed, 37 insertions(+)