summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs/inode.c11
-rw-r--r--include/linux/fs.h5
2 files changed, 4 insertions, 12 deletions
diff --git a/fs/inode.c b/fs/inode.c
index 83ab215baab..92de04b0baa 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1369,17 +1369,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/include/linux/fs.h b/include/linux/fs.h
index 0ab89426ba5..b89dc4d60d9 100644
--- a/include/linux/fs.h
+++ b/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 *),