From patchwork Wed Jan 20 21:26:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: harshad shirwadkar X-Patchwork-Id: 1429530 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=MDdjThB0; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DLk096Kcsz9sWX for ; Thu, 21 Jan 2021 11:33:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403917AbhAUAcq (ORCPT ); Wed, 20 Jan 2021 19:32:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733134AbhATVb5 (ORCPT ); Wed, 20 Jan 2021 16:31:57 -0500 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06555C0617B9 for ; Wed, 20 Jan 2021 13:27:00 -0800 (PST) Received: by mail-pg1-x529.google.com with SMTP id i7so16091154pgc.8 for ; Wed, 20 Jan 2021 13:27:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hbYg0dmC1MY0dedWjUNdFJ5OgHRTv+h70ftp7glRXZk=; b=MDdjThB0jifaTZb1u7RNmYDGaLyLvRPu975hSZSheVi6bateg6mOZB7JJ5OdBG22OW /APxRZWbw5gZpF9e2ylEEGUvileqGPI7SnlHkoeBc2JGkdR3d4NU8H+oHxauvs2FMFg5 yc3Tm0Zxnluur2XkqDtDoVTTj28gDtYf9t+tmnkiEaHH0s7Hf0yCc4cfRttoBdxJHWXw ENh3uSLUKqMLuFgEd92radGXA7BsdhAG1C7foshSAfVbdpwCmwbuDbxu789wFOIrqt8q QAInsdI0vO48ahKHG7yexk9IbB+/1UigTAF08KubdSPvtLg49oCPxXgLpVUevBRT6sP3 xBnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hbYg0dmC1MY0dedWjUNdFJ5OgHRTv+h70ftp7glRXZk=; b=WzAFniGgIVVsgzMCyfPOYdz6ofATozqYK4VqV1F2eb3caM3rgz27Hr0umGXT+l1u6B TOABV5pB0GQGnqg/CiL1NU1QogdfWjFLg1SJDFLO91l8OiDJNzSsZWormfw3JBuqt3t3 A+sIp8ETBMxcAt9VSiM7NBVJnE1Dhdwjbl55Crv++vU7+ka4eAtI5unBeiGkywmn8D0P h33ZV/YcvQVq4efANEuIJGq9cwWg0Ics8TXFtRajHrGRDv4guPShqRYtvPr13bLHfjGh JcuSwHe/9wDnEHZQeB1EBtvfypEJpRj6BlFjGWvtg/el190EldsFHw/WKJPcx+Q+yqq0 Aj+g== X-Gm-Message-State: AOAM531SWv5+xN6J2B4OLT5YtQYXmod/0dJEnTUXNSC9qa6+y6pYeDjB vSd9ifTsti7v3jNefWii/EuN6mqItoM= X-Google-Smtp-Source: ABdhPJzjHBmfQnGop3SraEev0GwmL5T/jOyROwpXgVtZw99z8ylL6awg1JGctJc2qF5t+dP+UOB9aA== X-Received: by 2002:a63:43c6:: with SMTP id q189mr11145566pga.245.1611178019071; Wed, 20 Jan 2021 13:26:59 -0800 (PST) Received: from harshads-520.kir.corp.google.com ([2620:15c:17:10:a6ae:11ff:fe11:86a2]) by smtp.googlemail.com with ESMTPSA id w1sm3396758pjt.23.2021.01.20.13.26.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jan 2021 13:26:58 -0800 (PST) From: Harshad Shirwadkar X-Google-Original-From: Harshad Shirwadkar <--global> To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu, Harshad Shirwadkar Subject: [PATCH v3 11/15] e2fsck: add fc replay for link, unlink, creat tags Date: Wed, 20 Jan 2021 13:26:37 -0800 Message-Id: <20210120212641.526556-12-user@harshads-520.kir.corp.google.com> X-Mailer: git-send-email 2.30.0.284.gd98b1dd5eaa7-goog In-Reply-To: <20210120212641.526556-1-user@harshads-520.kir.corp.google.com> References: <20210120212641.526556-1-user@harshads-520.kir.corp.google.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Harshad Shirwadkar Add fast commit replay for directory entry updates. Signed-off-by: Harshad Shirwadkar --- e2fsck/journal.c | 93 +++++++++++++++++++++++++++++++++++++++++++++ lib/ext2fs/ext2fs.h | 4 ++ lib/ext2fs/unlink.c | 6 +-- 3 files changed, 100 insertions(+), 3 deletions(-) diff --git a/e2fsck/journal.c b/e2fsck/journal.c index 9d0637e3..27ff5a76 100644 --- a/e2fsck/journal.c +++ b/e2fsck/journal.c @@ -380,6 +380,95 @@ static int ext4_fc_replay_scan(journal_t *j, struct buffer_head *bh, out_err: return ret; } +/* Helper struct for dentry replay routines */ +struct dentry_info_args { + int parent_ino, dname_len, ino, inode_len; + char *dname; +}; + +static inline void tl_to_darg(struct dentry_info_args *darg, + struct ext4_fc_tl *tl) +{ + struct ext4_fc_dentry_info *fcd; + int tag = le16_to_cpu(tl->fc_tag); + + fcd = (struct ext4_fc_dentry_info *)ext4_fc_tag_val(tl); + + darg->parent_ino = le32_to_cpu(fcd->fc_parent_ino); + darg->ino = le32_to_cpu(fcd->fc_ino); + darg->dname = fcd->fc_dname; + darg->dname_len = ext4_fc_tag_len(tl) - + sizeof(struct ext4_fc_dentry_info); + darg->dname = malloc(darg->dname_len + 1); + memcpy(darg->dname, fcd->fc_dname, darg->dname_len); + darg->dname[darg->dname_len] = 0; + jbd_debug(1, "%s: %s, ino %d, parent %d\n", + tag == EXT4_FC_TAG_CREAT ? "create" : + (tag == EXT4_FC_TAG_LINK ? "link" : + (tag == EXT4_FC_TAG_UNLINK ? "unlink" : "error")), + darg->dname, darg->ino, darg->parent_ino); +} + +static int ext4_fc_handle_unlink(e2fsck_t ctx, struct ext4_fc_tl *tl) +{ + struct ext2_inode inode; + struct dentry_info_args darg; + ext2_filsys fs = ctx->fs; + + tl_to_darg(&darg, tl); + ext2fs_unlink(ctx->fs, darg.parent_ino, darg.dname, darg.ino, 0); + /* It's okay if the above call fails */ + free(darg.dname); +} + +static int ext4_fc_handle_link_and_create(e2fsck_t ctx, struct ext4_fc_tl *tl) +{ + struct dentry_info_args darg; + ext2_filsys fs = ctx->fs; + struct ext2_inode_large inode_large; + int ret, filetype, mode; + + tl_to_darg(&darg, tl); + ret = ext2fs_read_inode(fs, darg.ino, + (struct ext2_inode *)&inode_large); + if (ret) + goto out; + + mode = inode_large.i_mode; + + if (LINUX_S_ISREG(mode)) + filetype = EXT2_FT_REG_FILE; + else if (LINUX_S_ISDIR(mode)) + filetype = EXT2_FT_DIR; + else if (LINUX_S_ISCHR(mode)) + filetype = EXT2_FT_CHRDEV; + else if (LINUX_S_ISBLK(mode)) + filetype = EXT2_FT_BLKDEV; + else if (LINUX_S_ISLNK(mode)) + return EXT2_FT_SYMLINK; + else if (LINUX_S_ISFIFO(mode)) + filetype = EXT2_FT_FIFO; + else if (LINUX_S_ISSOCK(mode)) + filetype = EXT2_FT_SOCK; + else { + ret = -EINVAL; + goto out; + } + + /* + * Forcefully unlink if the same name is present and ignore the error + * if any, since this dirent might not exist + */ + ext2fs_unlink(fs, darg.parent_ino, darg.dname, darg.ino, + EXT2FS_UNLINK_FORCE); + + ret = ext2fs_link(fs, darg.parent_ino, darg.dname, darg.ino, + filetype); +out: + free(darg.dname); + return ret; + +} /* * Main recovery path entry point. This function returns JBD2_FC_REPLAY_CONTINUE * to indicate that it is expecting more fast commit blocks. It returns @@ -437,7 +526,11 @@ static int ext4_fc_replay(journal_t *journal, struct buffer_head *bh, switch (le16_to_cpu(tl->fc_tag)) { case EXT4_FC_TAG_CREAT: case EXT4_FC_TAG_LINK: + ret = ext4_fc_handle_link_and_create(ctx, tl); + break; case EXT4_FC_TAG_UNLINK: + ret = ext4_fc_handle_unlink(ctx, tl); + break; case EXT4_FC_TAG_ADD_RANGE: case EXT4_FC_TAG_DEL_RANGE: case EXT4_FC_TAG_INODE: diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h index eb2e6549..931cd569 100644 --- a/lib/ext2fs/ext2fs.h +++ b/lib/ext2fs/ext2fs.h @@ -1684,6 +1684,10 @@ extern errcode_t ext2fs_get_pathname(ext2_filsys fs, ext2_ino_t dir, ext2_ino_t char **name); /* link.c */ +#define EXT2FS_UNLINK_FORCE 0x1 /* Forcefully unlink even if + * the inode number doesn't + * match the dirent + */ errcode_t ext2fs_link(ext2_filsys fs, ext2_ino_t dir, const char *name, ext2_ino_t ino, int flags); errcode_t ext2fs_unlink(ext2_filsys fs, ext2_ino_t dir, const char *name, diff --git a/lib/ext2fs/unlink.c b/lib/ext2fs/unlink.c index 8ab27ee2..3ec04cfb 100644 --- a/lib/ext2fs/unlink.c +++ b/lib/ext2fs/unlink.c @@ -49,7 +49,7 @@ static int unlink_proc(struct ext2_dir_entry *dirent, if (strncmp(ls->name, dirent->name, ext2fs_dirent_name_len(dirent))) return 0; } - if (ls->inode) { + if (!(ls->flags & EXT2FS_UNLINK_FORCE) && ls->inode) { if (dirent->inode != ls->inode) return 0; } else { @@ -70,7 +70,7 @@ static int unlink_proc(struct ext2_dir_entry *dirent, #endif errcode_t ext2fs_unlink(ext2_filsys fs, ext2_ino_t dir, const char *name, ext2_ino_t ino, - int flags EXT2FS_ATTR((unused))) + int flags) { errcode_t retval; struct link_struct ls; @@ -86,7 +86,7 @@ errcode_t ext2fs_unlink(ext2_filsys fs, ext2_ino_t dir, ls.name = name; ls.namelen = name ? strlen(name) : 0; ls.inode = ino; - ls.flags = 0; + ls.flags = flags; ls.done = 0; ls.prev = 0;