* Re: [PATCH 05/11] ubifs: Rename whiteout atomically [not found] <202110301821.Ik9ShD1B-lkp@intel.com> @ 2021-11-05 5:35 ` kernel test robot 0 siblings, 0 replies; 4+ messages in thread From: kernel test robot @ 2021-11-05 5:35 UTC (permalink / raw) To: Zhihao Cheng; +Cc: llvm, kbuild-all, linux-mtd, Linux Kernel Mailing List [-- Attachment #1: Type: text/plain, Size: 5598 bytes --] Hi Zhihao, Thank you for the patch! Perhaps something to improve: [auto build test WARNING on linux/master] [also build test WARNING on linus/master rw-ubifs/next v5.15-rc7 next-20211029] [cannot apply to rw-ubifs/fixes] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch] url: https://github.com/0day-ci/linux/commits/Zhihao-Cheng/Some-bugfixs-for-ubifs-ubi/20211025-113114 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 2f111a6fd5b5297b4e92f53798ca086f7c7d33a4 config: i386-randconfig-c001-20211028 (attached as .config) compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project 5db7568a6a1fcb408eb8988abdaff2a225a8eb72) reproduce (this is a W=1 build): wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # https://github.com/0day-ci/linux/commit/8a6ca5bc1be93cca9c7b0167a71bdd338f854600 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Zhihao-Cheng/Some-bugfixs-for-ubifs-ubi/20211025-113114 git checkout 8a6ca5bc1be93cca9c7b0167a71bdd338f854600 # save the attached .config to linux build tree COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=i386 clang-analyzer If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp@intel.com> clang-analyzer warnings: (new ones prefixed by >>) >> fs/ubifs/dir.c:379:2: warning: Value stored to 'ui' is never read [clang-analyzer-deadcode.DeadStores] ui = ubifs_inode(inode); ^ ~~~~~~~~~~~~~~~~~~ vim +/ui +379 fs/ubifs/dir.c 1e51764a3c2ac0 Artem Bityutskiy 2008-07-14 351 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 352 static struct inode *create_whiteout(struct inode *dir, struct dentry *dentry, 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 353 umode_t mode) 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 354 { 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 355 int err; 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 356 struct inode *inode; 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 357 struct ubifs_inode *ui; 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 358 struct ubifs_info *c = dir->i_sb->s_fs_info; 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 359 struct fscrypt_name nm; 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 360 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 361 /* 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 362 * Create an inode('nlink = 1') for whiteout without updating journal, 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 363 * let ubifs_jnl_rename() store it on flash to complete rename whiteout 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 364 * atomically. 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 365 */ 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 366 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 367 dbg_gen("dent '%pd', mode %#hx in dir ino %lu", 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 368 dentry, mode, dir->i_ino); 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 369 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 370 err = fscrypt_setup_filename(dir, &dentry->d_name, 0, &nm); 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 371 if (err) 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 372 return ERR_PTR(err); 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 373 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 374 inode = ubifs_new_inode(c, dir, mode); 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 375 if (IS_ERR(inode)) { 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 376 err = PTR_ERR(inode); 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 377 goto out_free; 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 378 } 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 @379 ui = ubifs_inode(inode); 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 380 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 381 init_special_inode(inode, inode->i_mode, WHITEOUT_DEV); 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 382 ubifs_assert(c, inode->i_op == &ubifs_file_inode_operations); 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 383 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 384 err = ubifs_init_security(dir, inode, &dentry->d_name); 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 385 if (err) 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 386 goto out_inode; 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 387 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 388 /* The dir size is updated by do_rename. */ 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 389 insert_inode_hash(inode); 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 390 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 391 return inode; 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 392 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 393 out_inode: 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 394 make_bad_inode(inode); 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 395 iput(inode); 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 396 out_free: 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 397 fscrypt_free_filename(&nm); 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 398 ubifs_err(c, "cannot create whiteout file, error %d", err); 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 399 return ERR_PTR(err); 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 400 } 8a6ca5bc1be93c Zhihao Cheng 2021-10-25 401 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 32366 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 00/11] Some bugfixs for ubifs/ubi
@ 2021-10-25 3:41 Zhihao Cheng
2021-10-25 3:41 ` [PATCH 05/11] ubifs: Rename whiteout atomically Zhihao Cheng
0 siblings, 1 reply; 4+ messages in thread
From: Zhihao Cheng @ 2021-10-25 3:41 UTC (permalink / raw)
To: richard, miquel.raynal, vigneshr, mcoquelin.stm32,
alexandre.torgue, Artem.Bityutskiy, ext-adrian.hunter
Cc: linux-mtd, linux-kernel, chengzhihao1
Zhihao Cheng (11):
ubifs: rename_whiteout: Fix double free for whiteout_ui->data
ubifs: Fix deadlock in concurrent rename whiteout and inode writeback
ubifs: Fix wrong number of inodes locked by ui_mutex in ubifs_inode
comment
ubifs: Add missing iput if do_tmpfile() failed in rename whiteout
ubifs: Rename whiteout atomically
ubifs: Fix 'ui->dirty' race between do_tmpfile() and writeback work
ubifs: Rectify space amount budget for mkdir/tmpfile operations
ubifs: setflags: Don't make a budget for 'ui->data_len'
ubifs: Fix read out-of-bounds in ubifs_wbuf_write_nolock()
ubi: fastmap: Return error code if memory allocation fails in
add_aeb()
ubi: fastmap: Add all fastmap pebs into 'ai->fastmap' when
fm->used_blocks>=2
drivers/mtd/ubi/fastmap.c | 69 ++++++-----
fs/ubifs/dir.c | 235 +++++++++++++++++++++++---------------
fs/ubifs/io.c | 34 +++++-
fs/ubifs/ioctl.c | 4 +-
fs/ubifs/journal.c | 53 +++++++--
fs/ubifs/ubifs.h | 2 +-
6 files changed, 254 insertions(+), 143 deletions(-)
--
2.31.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 05/11] ubifs: Rename whiteout atomically 2021-10-25 3:41 [PATCH 00/11] Some bugfixs for ubifs/ubi Zhihao Cheng @ 2021-10-25 3:41 ` Zhihao Cheng 2021-10-25 14:57 ` kernel test robot 2021-10-29 5:33 ` kernel test robot 0 siblings, 2 replies; 4+ messages in thread From: Zhihao Cheng @ 2021-10-25 3:41 UTC (permalink / raw) To: richard, miquel.raynal, vigneshr, mcoquelin.stm32, alexandre.torgue, Artem.Bityutskiy, ext-adrian.hunter Cc: linux-mtd, linux-kernel, chengzhihao1 Currently, rename whiteout has 3 steps: 1. create tmpfile(which associates old dentry to tmpfile inode) for whiteout, and store tmpfile to disk 2. link whiteout, associate whiteout inode to old dentry agagin and store old dentry, old inode, new dentry on disk 3. writeback dirty whiteout inode to disk Suddenly power-cut or error occurring(eg. ENOSPC returned by budget, memory allocation failure) during above steps may cause kinds of problems: Problem 1: ENOSPC returned by whiteout space budget (before step 2), old dentry will disappear after rename syscall, whiteout file cannot be found either. ls dir // we get file, whiteout rename(dir/file, dir/whiteout, REANME_WHITEOUT) ENOSPC = ubifs_budget_space(&wht_req) // return ls dir // empty (no file, no whiteout) Problem 2: Power-cut happens before step 3, whiteout inode with 'nlink=1' is not stored on disk, whiteout dentry(old dentry) is written on disk, whiteout file is lost on next mount (We get "dead directory entry" after executing 'ls -l' on whiteout file). Now, we use following 3 steps to finish rename whiteout: 1. create an in-mem inode with 'nlink = 1' as whiteout 2. ubifs_jnl_rename (Write on disk to finish associating old dentry to whiteout inode, associating new dentry with old inode) 3. iput(whiteout) Rely writing in-mem inode on disk by ubifs_jnl_rename() to finish rename whiteout, which avoids middle disk state caused by suddenly power-cut and error occurring. Fixes: 9e0a1fff8db56ea ("ubifs: Implement RENAME_WHITEOUT") Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com> --- fs/ubifs/dir.c | 144 +++++++++++++++++++++++++++++---------------- fs/ubifs/journal.c | 53 ++++++++++++++--- 2 files changed, 137 insertions(+), 60 deletions(-) diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 6503e6857f6e..6344e2bc9338 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -349,8 +349,58 @@ static int ubifs_create(struct user_namespace *mnt_userns, struct inode *dir, return err; } -static int do_tmpfile(struct inode *dir, struct dentry *dentry, - umode_t mode, struct inode **whiteout) +static struct inode *create_whiteout(struct inode *dir, struct dentry *dentry, + umode_t mode) +{ + int err; + struct inode *inode; + struct ubifs_inode *ui; + struct ubifs_info *c = dir->i_sb->s_fs_info; + struct fscrypt_name nm; + + /* + * Create an inode('nlink = 1') for whiteout without updating journal, + * let ubifs_jnl_rename() store it on flash to complete rename whiteout + * atomically. + */ + + dbg_gen("dent '%pd', mode %#hx in dir ino %lu", + dentry, mode, dir->i_ino); + + err = fscrypt_setup_filename(dir, &dentry->d_name, 0, &nm); + if (err) + return ERR_PTR(err); + + inode = ubifs_new_inode(c, dir, mode); + if (IS_ERR(inode)) { + err = PTR_ERR(inode); + goto out_free; + } + ui = ubifs_inode(inode); + + init_special_inode(inode, inode->i_mode, WHITEOUT_DEV); + ubifs_assert(c, inode->i_op == &ubifs_file_inode_operations); + + err = ubifs_init_security(dir, inode, &dentry->d_name); + if (err) + goto out_inode; + + /* The dir size is updated by do_rename. */ + insert_inode_hash(inode); + + return inode; + +out_inode: + make_bad_inode(inode); + iput(inode); +out_free: + fscrypt_free_filename(&nm); + ubifs_err(c, "cannot create whiteout file, error %d", err); + return ERR_PTR(err); +} + +static int ubifs_tmpfile(struct user_namespace *mnt_userns, struct inode *dir, + struct dentry *dentry, umode_t mode) { struct inode *inode; struct ubifs_info *c = dir->i_sb->s_fs_info; @@ -392,25 +442,13 @@ static int do_tmpfile(struct inode *dir, struct dentry *dentry, } ui = ubifs_inode(inode); - if (whiteout) { - init_special_inode(inode, inode->i_mode, WHITEOUT_DEV); - ubifs_assert(c, inode->i_op == &ubifs_file_inode_operations); - } - err = ubifs_init_security(dir, inode, &dentry->d_name); if (err) goto out_inode; mutex_lock(&ui->ui_mutex); insert_inode_hash(inode); - - if (whiteout) { - mark_inode_dirty(inode); - drop_nlink(inode); - *whiteout = inode; - } else { - d_tmpfile(dentry, inode); - } + d_tmpfile(dentry, inode); ubifs_assert(c, ui->dirty); instantiated = 1; @@ -441,12 +479,6 @@ static int do_tmpfile(struct inode *dir, struct dentry *dentry, return err; } -static int ubifs_tmpfile(struct user_namespace *mnt_userns, struct inode *dir, - struct dentry *dentry, umode_t mode) -{ - return do_tmpfile(dir, dentry, mode, NULL); -} - /** * vfs_dent_type - get VFS directory entry type. * @type: UBIFS directory entry type @@ -1264,17 +1296,19 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, .dirtied_ino = 3 }; struct ubifs_budget_req ino_req = { .dirtied_ino = 1, .dirtied_ino_d = ALIGN(old_inode_ui->data_len, 8) }; + struct ubifs_budget_req wht_req; struct timespec64 time; unsigned int saved_nlink; struct fscrypt_name old_nm, new_nm; /* - * Budget request settings: deletion direntry, new direntry, removing - * the old inode, and changing old and new parent directory inodes. + * Budget request settings: + * req: deletion direntry, new direntry, removing the old inode, + * and changing old and new parent directory inodes. + * + * wht_req: new whiteout inode for RENAME_WHITEOUT. * - * However, this operation also marks the target inode as dirty and - * does not write it, so we allocate budget for the target inode - * separately. + * ino_req: marks the target inode as dirty and does not write it. */ dbg_gen("dent '%pd' ino %lu in dir ino %lu to dent '%pd' in dir ino %lu flags 0x%x", @@ -1324,7 +1358,6 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, if (flags & RENAME_WHITEOUT) { union ubifs_dev_desc *dev = NULL; - struct ubifs_budget_req wht_req; dev = kmalloc(sizeof(union ubifs_dev_desc), GFP_NOFS); if (!dev) { @@ -1332,26 +1365,27 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, goto out_release; } - err = do_tmpfile(old_dir, old_dentry, S_IFCHR | WHITEOUT_MODE, &whiteout); - if (err) { - if (whiteout) - iput(whiteout); + /* + * The whiteout inode without dentry is pinned in memory, + * umount won't happen during rename process because we + * got parent dentry. + */ + whiteout = create_whiteout(old_dir, old_dentry, + S_IFCHR | WHITEOUT_MODE); + if (IS_ERR(whiteout)) { + err = PTR_ERR(whiteout); kfree(dev); goto out_release; } - spin_lock(&whiteout->i_lock); - whiteout->i_state |= I_LINKABLE; - spin_unlock(&whiteout->i_lock); - whiteout_ui = ubifs_inode(whiteout); whiteout_ui->data = dev; whiteout_ui->data_len = ubifs_encode_dev(dev, MKDEV(0, 0)); ubifs_assert(c, !whiteout_ui->dirty); memset(&wht_req, 0, sizeof(struct ubifs_budget_req)); - wht_req.dirtied_ino = 1; - wht_req.dirtied_ino_d = ALIGN(whiteout_ui->data_len, 8); + wht_req.new_ino = 1; + wht_req.new_ino_d = ALIGN(whiteout_ui->data_len, 8); /* * To avoid deadlock between space budget (holds ui_mutex and * waits wb work) and writeback work(waits ui_mutex), do space @@ -1359,6 +1393,11 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, */ err = ubifs_budget_space(c, &wht_req); if (err) { + /* + * Whiteout inode can not be written on flash by + * ubifs_jnl_write_inode(), because it's neither + * dirty nor zero-nlink. + */ iput(whiteout); goto out_release; } @@ -1433,17 +1472,8 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, sync = IS_DIRSYNC(old_dir) || IS_DIRSYNC(new_dir); if (unlink && IS_SYNC(new_inode)) sync = 1; - } - - if (whiteout) { - inc_nlink(whiteout); - mark_inode_dirty(whiteout); - - spin_lock(&whiteout->i_lock); - whiteout->i_state &= ~I_LINKABLE; - spin_unlock(&whiteout->i_lock); - - iput(whiteout); + if (whiteout && IS_SYNC(whiteout)) + sync = 1; } err = ubifs_jnl_rename(c, old_dir, old_inode, &old_nm, new_dir, @@ -1454,6 +1484,11 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, unlock_4_inodes(old_dir, new_dir, new_inode, whiteout); ubifs_release_budget(c, &req); + if (whiteout) { + ubifs_release_budget(c, &wht_req); + iput(whiteout); + } + mutex_lock(&old_inode_ui->ui_mutex); release = old_inode_ui->dirty; mark_inode_dirty_sync(old_inode); @@ -1462,11 +1497,16 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, if (release) ubifs_release_budget(c, &ino_req); if (IS_SYNC(old_inode)) - err = old_inode->i_sb->s_op->write_inode(old_inode, NULL); + /* + * Rename finished here. Although old inode cannot be updated + * on flash, old ctime is not a big problem, don't return err + * code to userspace. + */ + old_inode->i_sb->s_op->write_inode(old_inode, NULL); fscrypt_free_filename(&old_nm); fscrypt_free_filename(&new_nm); - return err; + return 0; out_cancel: if (unlink) { @@ -1487,11 +1527,11 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, inc_nlink(old_dir); } } + unlock_4_inodes(old_dir, new_dir, new_inode, whiteout); if (whiteout) { - drop_nlink(whiteout); + ubifs_release_budget(c, &wht_req); iput(whiteout); } - unlock_4_inodes(old_dir, new_dir, new_inode, whiteout); out_release: ubifs_release_budget(c, &ino_req); ubifs_release_budget(c, &req); diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c index 8ea680dba61e..a77821f922e2 100644 --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c @@ -1207,9 +1207,9 @@ int ubifs_jnl_xrename(struct ubifs_info *c, const struct inode *fst_dir, * @sync: non-zero if the write-buffer has to be synchronized * * This function implements the re-name operation which may involve writing up - * to 4 inodes and 2 directory entries. It marks the written inodes as clean - * and returns zero on success. In case of failure, a negative error code is - * returned. + * to 4 inodes(new inode, whiteout inode, old and new parent directory inodes) + * and 2 directory entries. It marks the written inodes as clean and returns + * zero on success. In case of failure, a negative error code is returned. */ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, const struct inode *old_inode, @@ -1222,14 +1222,15 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, void *p; union ubifs_key key; struct ubifs_dent_node *dent, *dent2; - int err, dlen1, dlen2, ilen, lnum, offs, len, orphan_added = 0; + int err, dlen1, dlen2, ilen, wlen, lnum, offs, len, orphan_added = 0; int aligned_dlen1, aligned_dlen2, plen = UBIFS_INO_NODE_SZ; int last_reference = !!(new_inode && new_inode->i_nlink == 0); int move = (old_dir != new_dir); - struct ubifs_inode *new_ui; + struct ubifs_inode *new_ui, *whiteout_ui; u8 hash_old_dir[UBIFS_HASH_ARR_SZ]; u8 hash_new_dir[UBIFS_HASH_ARR_SZ]; u8 hash_new_inode[UBIFS_HASH_ARR_SZ]; + u8 hash_whiteout_inode[UBIFS_HASH_ARR_SZ]; u8 hash_dent1[UBIFS_HASH_ARR_SZ]; u8 hash_dent2[UBIFS_HASH_ARR_SZ]; @@ -1249,9 +1250,20 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, } else ilen = 0; + if (whiteout) { + whiteout_ui = ubifs_inode(whiteout); + ubifs_assert(c, mutex_is_locked(&whiteout_ui->ui_mutex)); + ubifs_assert(c, whiteout->i_nlink == 1); + ubifs_assert(c, !whiteout_ui->dirty); + wlen = UBIFS_INO_NODE_SZ; + wlen += whiteout_ui->data_len; + } else + wlen = 0; + aligned_dlen1 = ALIGN(dlen1, 8); aligned_dlen2 = ALIGN(dlen2, 8); - len = aligned_dlen1 + aligned_dlen2 + ALIGN(ilen, 8) + ALIGN(plen, 8); + len = aligned_dlen1 + aligned_dlen2 + ALIGN(ilen, 8) + + ALIGN(wlen, 8) + ALIGN(plen, 8); if (move) len += plen; @@ -1313,6 +1325,15 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, p += ALIGN(ilen, 8); } + if (whiteout) { + pack_inode(c, p, whiteout, 0); + err = ubifs_node_calc_hash(c, p, hash_whiteout_inode); + if (err) + goto out_release; + + p += ALIGN(wlen, 8); + } + if (!move) { pack_inode(c, p, old_dir, 1); err = ubifs_node_calc_hash(c, p, hash_old_dir); @@ -1352,6 +1373,9 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, if (new_inode) ubifs_wbuf_add_ino_nolock(&c->jheads[BASEHD].wbuf, new_inode->i_ino); + if (whiteout) + ubifs_wbuf_add_ino_nolock(&c->jheads[BASEHD].wbuf, + whiteout->i_ino); } release_head(c, BASEHD); @@ -1368,8 +1392,6 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, err = ubifs_tnc_add_nm(c, &key, lnum, offs, dlen2, hash_dent2, old_nm); if (err) goto out_ro; - - ubifs_delete_orphan(c, whiteout->i_ino); } else { err = ubifs_add_dirt(c, lnum, dlen2); if (err) @@ -1390,6 +1412,15 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, offs += ALIGN(ilen, 8); } + if (whiteout) { + ino_key_init(c, &key, whiteout->i_ino); + err = ubifs_tnc_add(c, &key, lnum, offs, wlen, + hash_whiteout_inode); + if (err) + goto out_ro; + offs += ALIGN(wlen, 8); + } + ino_key_init(c, &key, old_dir->i_ino); err = ubifs_tnc_add(c, &key, lnum, offs, plen, hash_old_dir); if (err) @@ -1410,6 +1441,12 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, new_ui->synced_i_size = new_ui->ui_size; spin_unlock(&new_ui->ui_lock); } + if (whiteout) { + /* No need to mark whiteout inode clean */ + spin_lock(&whiteout_ui->ui_lock); + whiteout_ui->synced_i_size = whiteout_ui->ui_size; + spin_unlock(&whiteout_ui->ui_lock); + } mark_inode_clean(c, ubifs_inode(old_dir)); if (move) mark_inode_clean(c, ubifs_inode(new_dir)); -- 2.31.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 05/11] ubifs: Rename whiteout atomically 2021-10-25 3:41 ` [PATCH 05/11] ubifs: Rename whiteout atomically Zhihao Cheng @ 2021-10-25 14:57 ` kernel test robot 2021-10-29 5:33 ` kernel test robot 1 sibling, 0 replies; 4+ messages in thread From: kernel test robot @ 2021-10-25 14:57 UTC (permalink / raw) To: Zhihao Cheng, richard, miquel.raynal, vigneshr, mcoquelin.stm32, alexandre.torgue, Artem.Bityutskiy, ext-adrian.hunter Cc: llvm, kbuild-all, linux-mtd, linux-kernel, chengzhihao1 [-- Attachment #1: Type: text/plain, Size: 3455 bytes --] Hi Zhihao, Thank you for the patch! Perhaps something to improve: [auto build test WARNING on linux/master] [also build test WARNING on linus/master rw-ubifs/next v5.15-rc6 next-20211025] [cannot apply to rw-ubifs/fixes] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch] url: https://github.com/0day-ci/linux/commits/Zhihao-Cheng/Some-bugfixs-for-ubifs-ubi/20211025-113114 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 2f111a6fd5b5297b4e92f53798ca086f7c7d33a4 config: i386-randconfig-a006-20211025 (attached as .config) compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project a461fa64bb37cffd73f683c74f6b0780379fc2ca) reproduce (this is a W=1 build): wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # https://github.com/0day-ci/linux/commit/8a6ca5bc1be93cca9c7b0167a71bdd338f854600 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Zhihao-Cheng/Some-bugfixs-for-ubifs-ubi/20211025-113114 git checkout 8a6ca5bc1be93cca9c7b0167a71bdd338f854600 # save the attached .config to linux build tree COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 ARCH=i386 If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp@intel.com> All warnings (new ones prefixed by >>): >> fs/ubifs/dir.c:357:22: warning: variable 'ui' set but not used [-Wunused-but-set-variable] struct ubifs_inode *ui; ^ 1 warning generated. vim +/ui +357 fs/ubifs/dir.c 351 352 static struct inode *create_whiteout(struct inode *dir, struct dentry *dentry, 353 umode_t mode) 354 { 355 int err; 356 struct inode *inode; > 357 struct ubifs_inode *ui; 358 struct ubifs_info *c = dir->i_sb->s_fs_info; 359 struct fscrypt_name nm; 360 361 /* 362 * Create an inode('nlink = 1') for whiteout without updating journal, 363 * let ubifs_jnl_rename() store it on flash to complete rename whiteout 364 * atomically. 365 */ 366 367 dbg_gen("dent '%pd', mode %#hx in dir ino %lu", 368 dentry, mode, dir->i_ino); 369 370 err = fscrypt_setup_filename(dir, &dentry->d_name, 0, &nm); 371 if (err) 372 return ERR_PTR(err); 373 374 inode = ubifs_new_inode(c, dir, mode); 375 if (IS_ERR(inode)) { 376 err = PTR_ERR(inode); 377 goto out_free; 378 } 379 ui = ubifs_inode(inode); 380 381 init_special_inode(inode, inode->i_mode, WHITEOUT_DEV); 382 ubifs_assert(c, inode->i_op == &ubifs_file_inode_operations); 383 384 err = ubifs_init_security(dir, inode, &dentry->d_name); 385 if (err) 386 goto out_inode; 387 388 /* The dir size is updated by do_rename. */ 389 insert_inode_hash(inode); 390 391 return inode; 392 393 out_inode: 394 make_bad_inode(inode); 395 iput(inode); 396 out_free: 397 fscrypt_free_filename(&nm); 398 ubifs_err(c, "cannot create whiteout file, error %d", err); 399 return ERR_PTR(err); 400 } 401 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 34879 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 05/11] ubifs: Rename whiteout atomically 2021-10-25 3:41 ` [PATCH 05/11] ubifs: Rename whiteout atomically Zhihao Cheng 2021-10-25 14:57 ` kernel test robot @ 2021-10-29 5:33 ` kernel test robot 1 sibling, 0 replies; 4+ messages in thread From: kernel test robot @ 2021-10-29 5:33 UTC (permalink / raw) To: Zhihao Cheng, richard, miquel.raynal, vigneshr, mcoquelin.stm32, alexandre.torgue, Artem.Bityutskiy, ext-adrian.hunter Cc: kbuild-all, linux-mtd, linux-kernel, chengzhihao1 [-- Attachment #1: Type: text/plain, Size: 3272 bytes --] Hi Zhihao, Thank you for the patch! Yet something to improve: [auto build test ERROR on linux/master] [also build test ERROR on linus/master rw-ubifs/next v5.15-rc7 next-20211028] [cannot apply to rw-ubifs/fixes] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch] url: https://github.com/0day-ci/linux/commits/Zhihao-Cheng/Some-bugfixs-for-ubifs-ubi/20211025-113114 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 2f111a6fd5b5297b4e92f53798ca086f7c7d33a4 config: x86_64-buildonly-randconfig-r004-20211028 (attached as .config) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0 reproduce (this is a W=1 build): # https://github.com/0day-ci/linux/commit/8a6ca5bc1be93cca9c7b0167a71bdd338f854600 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Zhihao-Cheng/Some-bugfixs-for-ubifs-ubi/20211025-113114 git checkout 8a6ca5bc1be93cca9c7b0167a71bdd338f854600 # save the attached .config to linux build tree make W=1 ARCH=x86_64 If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp@intel.com> All errors (new ones prefixed by >>): fs/ubifs/dir.c: In function 'create_whiteout': >> fs/ubifs/dir.c:357:22: error: variable 'ui' set but not used [-Werror=unused-but-set-variable] 357 | struct ubifs_inode *ui; | ^~ cc1: all warnings being treated as errors vim +/ui +357 fs/ubifs/dir.c 351 352 static struct inode *create_whiteout(struct inode *dir, struct dentry *dentry, 353 umode_t mode) 354 { 355 int err; 356 struct inode *inode; > 357 struct ubifs_inode *ui; 358 struct ubifs_info *c = dir->i_sb->s_fs_info; 359 struct fscrypt_name nm; 360 361 /* 362 * Create an inode('nlink = 1') for whiteout without updating journal, 363 * let ubifs_jnl_rename() store it on flash to complete rename whiteout 364 * atomically. 365 */ 366 367 dbg_gen("dent '%pd', mode %#hx in dir ino %lu", 368 dentry, mode, dir->i_ino); 369 370 err = fscrypt_setup_filename(dir, &dentry->d_name, 0, &nm); 371 if (err) 372 return ERR_PTR(err); 373 374 inode = ubifs_new_inode(c, dir, mode); 375 if (IS_ERR(inode)) { 376 err = PTR_ERR(inode); 377 goto out_free; 378 } 379 ui = ubifs_inode(inode); 380 381 init_special_inode(inode, inode->i_mode, WHITEOUT_DEV); 382 ubifs_assert(c, inode->i_op == &ubifs_file_inode_operations); 383 384 err = ubifs_init_security(dir, inode, &dentry->d_name); 385 if (err) 386 goto out_inode; 387 388 /* The dir size is updated by do_rename. */ 389 insert_inode_hash(inode); 390 391 return inode; 392 393 out_inode: 394 make_bad_inode(inode); 395 iput(inode); 396 out_free: 397 fscrypt_free_filename(&nm); 398 ubifs_err(c, "cannot create whiteout file, error %d", err); 399 return ERR_PTR(err); 400 } 401 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 35706 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-11-05 5:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <202110301821.Ik9ShD1B-lkp@intel.com>
2021-11-05 5:35 ` [PATCH 05/11] ubifs: Rename whiteout atomically kernel test robot
2021-10-25 3:41 [PATCH 00/11] Some bugfixs for ubifs/ubi Zhihao Cheng
2021-10-25 3:41 ` [PATCH 05/11] ubifs: Rename whiteout atomically Zhihao Cheng
2021-10-25 14:57 ` kernel test robot
2021-10-29 5:33 ` kernel test robot
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).