History

ext4: fix rename whiteout with fast commit

This patch adds rename whiteout support in fast commits. Note that the whiteout object that gets created is actually char device. Which imples, the function ext4_inode_journal_mode(struct inode *inode) would return "JOURNAL_DATA" for this inode. This has a consequence in fast commit code that it will make creation of the whiteout object a fast-commit ineligible behavior and thus will fall back to full commits. With this patch, this can be observed by running fast commits with rename whiteout and seeing the stats generated by ext4_fc_stats tracepoint as follows: ext4_fc_stats: dev 254:32 fc ineligible reasons: XATTR:0, CROSS_RENAME:0, JOURNAL_FLAG_CHANGE:0, NO_MEM:0, SWAP_BOOT:0, RESIZE:0, RENAME_DIR:0, FALLOC_RANGE:0, INODE_JOURNAL_DATA:16; num_commits:6, ineligible: 6, numblks: 3 So in short, this patch guarantees that in case of rename whiteout, we fall back to full commits. Amir mentioned that instead of creating a new whiteout object for every rename, we can create a static whiteout object with irrelevant nlink. That will make fast commits to not fall back to full commit. But until this happens, this patch will ensure correctness by falling back to full commits.

Harshad Shirwadkar committed 5 years ago

Commit 8210bb21 parent 2a4ae3b3 files · +12 −2Browse files

Unified · Split

3 files
  1. fs/ext4/ext4.h +2 −0
  2. fs/ext4/fast_commit.c +7 −2
  3. fs/ext4/namei.c +3 −0
fs/ext4/ext4.h+2−0
@@ -2794,6 +2794,8 @@ void __ext4_fc_track_link(handle_t *handle, struct inode *inode, · 2793 unmodified lines
2794 struct dentry *dentry);2794 struct dentry *dentry);
2795void ext4_fc_track_unlink(handle_t *handle, struct dentry *dentry);2795void ext4_fc_track_unlink(handle_t *handle, struct dentry *dentry);
2796void ext4_fc_track_link(handle_t *handle, struct dentry *dentry);2796void ext4_fc_track_link(handle_t *handle, struct dentry *dentry);
2797void __ext4_fc_track_create(handle_t *handle, struct inode *inode,
2798 struct dentry *dentry);
2797void ext4_fc_track_create(handle_t *handle, struct dentry *dentry);2799void ext4_fc_track_create(handle_t *handle, struct dentry *dentry);
2798void ext4_fc_track_inode(handle_t *handle, struct inode *inode);2800void ext4_fc_track_inode(handle_t *handle, struct inode *inode);
2799void ext4_fc_mark_ineligible(struct super_block *sb, int reason);2801void ext4_fc_mark_ineligible(struct super_block *sb, int reason);
fs/ext4/fast_commit.c+7−2
@@ -513,10 +513,10 @@ void ext4_fc_track_link(handle_t *handle, struct dentry *dentry) · 512 unmodified lines
513 __ext4_fc_track_link(handle, d_inode(dentry), dentry);513 __ext4_fc_track_link(handle, d_inode(dentry), dentry);
514}514}
515 515
516void ext4_fc_track_create(handle_t *handle, struct dentry *dentry)516void __ext4_fc_track_create(handle_t *handle, struct inode *inode,
517 struct dentry *dentry)
517{518{
518 struct __track_dentry_update_args args;519 struct __track_dentry_update_args args;
519 struct inode *inode = d_inode(dentry);
520 int ret;520 int ret;
521 521
522 args.dentry = dentry;522 args.dentry = dentry;
@@ -527,6 +527,11 @@ void ext4_fc_track_create(handle_t *handle, struct dentry *dentry) · 4 unmodified lines
527 trace_ext4_fc_track_create(inode, dentry, ret);527 trace_ext4_fc_track_create(inode, dentry, ret);
528}528}
529 529
530void ext4_fc_track_create(handle_t *handle, struct dentry *dentry)
531{
532 __ext4_fc_track_create(handle, d_inode(dentry), dentry);
533}
534
530/* __track_fn for inode tracking */535/* __track_fn for inode tracking */
531static int __track_inode(struct inode *inode, void *arg, bool update)536static int __track_inode(struct inode *inode, void *arg, bool update)
532{537{
fs/ext4/namei.c+3−0
@@ -3873,6 +3873,7 @@ static int ext4_rename(struct user_namespace *mnt_userns, struct inode *old_dir, · 3872 unmodified lines
3873 retval = ext4_mark_inode_dirty(handle, whiteout);3873 retval = ext4_mark_inode_dirty(handle, whiteout);
3874 if (unlikely(retval))3874 if (unlikely(retval))
3875 goto end_rename;3875 goto end_rename;
3876
3876 }3877 }
3877 if (!new.bh) {3878 if (!new.bh) {
3878 retval = ext4_add_entry(handle, new.dentry, old.inode);3879 retval = ext4_add_entry(handle, new.dentry, old.inode);
@@ -3946,6 +3947,8 @@ static int ext4_rename(struct user_namespace *mnt_userns, struct inode *old_dir, · 67 unmodified lines
3946 ext4_fc_track_unlink(handle, new.dentry);3947 ext4_fc_track_unlink(handle, new.dentry);
3947 __ext4_fc_track_link(handle, old.inode, new.dentry);3948 __ext4_fc_track_link(handle, old.inode, new.dentry);
3948 __ext4_fc_track_unlink(handle, old.inode, old.dentry);3949 __ext4_fc_track_unlink(handle, old.inode, old.dentry);
3950 if (whiteout)
3951 __ext4_fc_track_create(handle, whiteout, old.dentry);
3949 }3952 }
3950 3953
3951 if (new.inode) {3954 if (new.inode) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t