---

yaml --- r: 292322 b: refs/heads/master c: 9bcb4b7 h: refs/heads/master v: v3
git-mirror · Mar 21, 2012 · 098f0c1 · 098f0c1
1 parent de96e97
commit 098f0c1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e28e832c3e1e1197873cfd0b6ce86868cf5c391d
+refs/heads/master: 9bcb4b733c22b7dbc4cf847e707ac98f751e9180
diff --git a/trunk/fs/inode.c b/trunk/fs/inode.c
@@ -1368,17 +1368,6 @@ int generic_delete_inode(struct inode *inode)
 }
 EXPORT_SYMBOL(generic_delete_inode);
 
-/*
- * Normal UNIX filesystem behaviour: delete the
- * inode when the usage count drops to zero, and
- * i_nlink is zero.
- */
-int generic_drop_inode(struct inode *inode)
-{
-	return !inode->i_nlink || inode_unhashed(inode);
-}
-EXPORT_SYMBOL_GPL(generic_drop_inode);
-
 /*
  * Called when we're dropping the last reference
  * to an inode.

diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
@@ -2305,7 +2305,10 @@ extern struct inode * igrab(struct inode *);
 extern ino_t iunique(struct super_block *, ino_t);
 extern int inode_needs_sync(struct inode *inode);
 extern int generic_delete_inode(struct inode *inode);
-extern int generic_drop_inode(struct inode *inode);
+static inline int generic_drop_inode(struct inode *inode)
+{
+	return !inode->i_nlink || inode_unhashed(inode);
+}
 
 extern struct inode *ilookup5_nowait(struct super_block *sb,
 		unsigned long hashval, int (*test)(struct inode *, void *),