summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2018-07-09 23:27:33 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2018-08-12 17:04:12 -0400
commit36cbbecaefea10b9e368134c96bf6c9979707c24 (patch)
treed3c6d0a781d73a6071530399274a179fe4a4c825
parent81cb6568131df783dcf01df1dc7a7dc56f8f1628 (diff)
fs: factor out d_mark_tmpfile()
New helper for bcachefs - bcachefs doesn't want the inode_dec_link_count() call that d_tmpfile does, it handles i_nlink on its own atomically with other btree updates Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
-rw-r--r--fs/dcache.c10
-rw-r--r--include/linux/dcache.h1
2 files changed, 9 insertions, 2 deletions
diff --git a/fs/dcache.c b/fs/dcache.c
index ceb7b491d1b9..285e53ae231d 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -3087,9 +3087,8 @@ void d_genocide(struct dentry *parent)
EXPORT_SYMBOL(d_genocide);
-void d_tmpfile(struct dentry *dentry, struct inode *inode)
+void d_mark_tmpfile(struct dentry *dentry, struct inode *inode)
{
- inode_dec_link_count(inode);
BUG_ON(dentry->d_name.name != dentry->d_iname ||
!hlist_unhashed(&dentry->d_u.d_alias) ||
!d_unlinked(dentry));
@@ -3099,6 +3098,13 @@ void d_tmpfile(struct dentry *dentry, struct inode *inode)
(unsigned long long)inode->i_ino);
spin_unlock(&dentry->d_lock);
spin_unlock(&dentry->d_parent->d_lock);
+}
+EXPORT_SYMBOL(d_mark_tmpfile);
+
+void d_tmpfile(struct dentry *dentry, struct inode *inode)
+{
+ inode_dec_link_count(inode);
+ d_mark_tmpfile(dentry, inode);
d_instantiate(dentry, inode);
}
EXPORT_SYMBOL(d_tmpfile);
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index 66c6e17e61e5..255b7155d631 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -256,6 +256,7 @@ extern struct dentry * d_make_root(struct inode *);
/* <clickety>-<click> the ramfs-type tree */
extern void d_genocide(struct dentry *);
+extern void d_mark_tmpfile(struct dentry *, struct inode *);
extern void d_tmpfile(struct dentry *, struct inode *);
extern struct dentry *d_find_alias(struct inode *);