Re: [PATCH 3/4] ubifs: Update directory size when creating whiteouts

[Zhihao Cheng]

在 2021/1/23 5:22, Richard Weinberger 写道:

Although whiteouts are unlinked files they will get re-linked later,

I just want to make sure, is this where the count is increased?
do_rename -> inc_nlink(whiteout)

therefore the size of the parent directory needs to be updated too.

Cc: sta...@vger.kernel.org
Fixes: 9e0a1fff8db5 ("ubifs: Implement RENAME_WHITEOUT")
Signed-off-by: Richard Weinberger <rich...@nod.at>
---
  fs/ubifs/dir.c | 4 ++++
  1 file changed, 4 insertions(+)

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 8a34e0118ee9..b5d523e5854f 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -361,6 +361,7 @@ static int do_tmpfile(struct inode *dir, struct dentry 
*dentry,
        struct ubifs_budget_req ino_req = { .dirtied_ino = 1 };
        struct ubifs_inode *ui, *dir_ui = ubifs_inode(dir);
        int err, instantiated = 0;
+       int sz_change = 0;
        struct fscrypt_name nm;

/*

@@ -411,6 +412,8 @@ static int do_tmpfile(struct inode *dir, struct dentry 
*dentry,
                mark_inode_dirty(inode);
                drop_nlink(inode);
                *whiteout = inode;
+               sz_change = CALC_DENT_SIZE(fname_len(&nm));
+               dir->i_size += sz_change;
        } else {
                d_tmpfile(dentry, inode);
        }
@@ -430,6 +433,7 @@ static int do_tmpfile(struct inode *dir, struct dentry 
*dentry,
        return 0;

out_cancel:

Does this need a judgment? Like this,
if (whiteout)
    dir->i_size -= sz_change;

+       dir->i_size -= sz_change;
        mutex_unlock(&dir_ui->ui_mutex);
  out_inode:
        make_bad_inode(inode);