diff options
-rw-r--r-- | fs/inode.c | 11 | ||||
-rw-r--r-- | include/linux/fs.h | 5 |
2 files changed, 4 insertions, 12 deletions
diff --git a/fs/inode.c b/fs/inode.c index 83ab215baab1..92de04b0baa2 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
@@ -1369,17 +1369,6 @@ int generic_delete_inode(struct inode *inode) | |||
1369 | EXPORT_SYMBOL(generic_delete_inode); | 1369 | EXPORT_SYMBOL(generic_delete_inode); |
1370 | 1370 | ||
1371 | /* | 1371 | /* |
1372 | * Normal UNIX filesystem behaviour: delete the | ||
1373 | * inode when the usage count drops to zero, and | ||
1374 | * i_nlink is zero. | ||
1375 | */ | ||
1376 | int generic_drop_inode(struct inode *inode) | ||
1377 | { | ||
1378 | return !inode->i_nlink || inode_unhashed(inode); | ||
1379 | } | ||
1380 | EXPORT_SYMBOL_GPL(generic_drop_inode); | ||
1381 | |||
1382 | /* | ||
1383 | * Called when we're dropping the last reference | 1372 | * Called when we're dropping the last reference |
1384 | * to an inode. | 1373 | * to an inode. |
1385 | * | 1374 | * |
diff --git a/include/linux/fs.h b/include/linux/fs.h index 0ab89426ba55..b89dc4d60d99 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -2305,7 +2305,10 @@ extern struct inode * igrab(struct inode *); | |||
2305 | extern ino_t iunique(struct super_block *, ino_t); | 2305 | extern ino_t iunique(struct super_block *, ino_t); |
2306 | extern int inode_needs_sync(struct inode *inode); | 2306 | extern int inode_needs_sync(struct inode *inode); |
2307 | extern int generic_delete_inode(struct inode *inode); | 2307 | extern int generic_delete_inode(struct inode *inode); |
2308 | extern int generic_drop_inode(struct inode *inode); | 2308 | static inline int generic_drop_inode(struct inode *inode) |
2309 | { | ||
2310 | return !inode->i_nlink || inode_unhashed(inode); | ||
2311 | } | ||
2309 | 2312 | ||
2310 | extern struct inode *ilookup5_nowait(struct super_block *sb, | 2313 | extern struct inode *ilookup5_nowait(struct super_block *sb, |
2311 | unsigned long hashval, int (*test)(struct inode *, void *), | 2314 | unsigned long hashval, int (*test)(struct inode *, void *), |