summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Qi <joseph.qi@linux.alibaba.com>2019-09-23 18:33:11 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2019-09-24 18:54:07 -0400
commit963abb9aebcdacf5c709a36da9ac0727a33671eb (patch)
tree794eca82ee573017f3230d235f50c41110d80161
parentbbd0f32721e28cc7097fa50afa96178896f9e33b (diff)
jbd2: remove jbd2_journal_inode_add_[write|wait]
Since ext4/ocfs2 are using jbd2_inode dirty range scoping APIs now, jbd2_journal_inode_add_[write|wait] are not used any more, remove them. Link: http://lkml.kernel.org/r/1562977611-8412-2-git-send-email-joseph.qi@linux.alibaba.com Signed-off-by: Joseph Qi <joseph.qi@linux.alibaba.com> Reviewed-by: Ross Zwisler <zwisler@google.com> Acked-by: Changwei Ge <chge@linux.alibaba.com> Cc: Gang He <ghe@suse.com> Cc: Joel Becker <jlbec@evilplan.org> Cc: Joseph Qi <jiangqi903@gmail.com> Cc: Jun Piao <piaojun@huawei.com> Cc: Junxiao Bi <junxiao.bi@oracle.com> Cc: Mark Fasheh <mark@fasheh.com> Cc: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/jbd2/journal.c2
-rw-r--r--fs/jbd2/transaction.c12
-rw-r--r--include/linux/jbd2.h2
3 files changed, 0 insertions, 16 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 953990eb70a9..1c58859aa592 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -89,8 +89,6 @@ EXPORT_SYMBOL(jbd2_journal_blocks_per_page);
89EXPORT_SYMBOL(jbd2_journal_invalidatepage); 89EXPORT_SYMBOL(jbd2_journal_invalidatepage);
90EXPORT_SYMBOL(jbd2_journal_try_to_free_buffers); 90EXPORT_SYMBOL(jbd2_journal_try_to_free_buffers);
91EXPORT_SYMBOL(jbd2_journal_force_commit); 91EXPORT_SYMBOL(jbd2_journal_force_commit);
92EXPORT_SYMBOL(jbd2_journal_inode_add_write);
93EXPORT_SYMBOL(jbd2_journal_inode_add_wait);
94EXPORT_SYMBOL(jbd2_journal_inode_ranged_write); 92EXPORT_SYMBOL(jbd2_journal_inode_ranged_write);
95EXPORT_SYMBOL(jbd2_journal_inode_ranged_wait); 93EXPORT_SYMBOL(jbd2_journal_inode_ranged_wait);
96EXPORT_SYMBOL(jbd2_journal_init_jbd_inode); 94EXPORT_SYMBOL(jbd2_journal_init_jbd_inode);
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index afc06daee5bb..bee8498d7792 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -2622,18 +2622,6 @@ done:
2622 return 0; 2622 return 0;
2623} 2623}
2624 2624
2625int jbd2_journal_inode_add_write(handle_t *handle, struct jbd2_inode *jinode)
2626{
2627 return jbd2_journal_file_inode(handle, jinode,
2628 JI_WRITE_DATA | JI_WAIT_DATA, 0, LLONG_MAX);
2629}
2630
2631int jbd2_journal_inode_add_wait(handle_t *handle, struct jbd2_inode *jinode)
2632{
2633 return jbd2_journal_file_inode(handle, jinode, JI_WAIT_DATA, 0,
2634 LLONG_MAX);
2635}
2636
2637int jbd2_journal_inode_ranged_write(handle_t *handle, 2625int jbd2_journal_inode_ranged_write(handle_t *handle,
2638 struct jbd2_inode *jinode, loff_t start_byte, loff_t length) 2626 struct jbd2_inode *jinode, loff_t start_byte, loff_t length)
2639{ 2627{
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index df03825ad1a1..603fbc4e2f70 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -1410,8 +1410,6 @@ extern int jbd2_journal_clear_err (journal_t *);
1410extern int jbd2_journal_bmap(journal_t *, unsigned long, unsigned long long *); 1410extern int jbd2_journal_bmap(journal_t *, unsigned long, unsigned long long *);
1411extern int jbd2_journal_force_commit(journal_t *); 1411extern int jbd2_journal_force_commit(journal_t *);
1412extern int jbd2_journal_force_commit_nested(journal_t *); 1412extern int jbd2_journal_force_commit_nested(journal_t *);
1413extern int jbd2_journal_inode_add_write(handle_t *handle, struct jbd2_inode *inode);
1414extern int jbd2_journal_inode_add_wait(handle_t *handle, struct jbd2_inode *inode);
1415extern int jbd2_journal_inode_ranged_write(handle_t *handle, 1413extern int jbd2_journal_inode_ranged_write(handle_t *handle,
1416 struct jbd2_inode *inode, loff_t start_byte, 1414 struct jbd2_inode *inode, loff_t start_byte,
1417 loff_t length); 1415 loff_t length);