From patchwork Thu Dec 1 22:02:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Weinberger X-Patchwork-Id: 9457087 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3774560515 for ; Thu, 1 Dec 2016 22:03:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2894D2852E for ; Thu, 1 Dec 2016 22:03:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1D00528540; Thu, 1 Dec 2016 22:03:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 846432852E for ; Thu, 1 Dec 2016 22:03:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761072AbcLAWCm (ORCPT ); Thu, 1 Dec 2016 17:02:42 -0500 Received: from mail.sigma-star.at ([95.130.255.111]:46000 "EHLO mail.sigma-star.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760720AbcLAWCk (ORCPT ); Thu, 1 Dec 2016 17:02:40 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.sigma-star.at (Postfix) with ESMTP id 4D59424E0005; Thu, 1 Dec 2016 23:02:36 +0100 (CET) Received: from linux.site (richard.vpn.sigmapriv.at [10.3.0.5]) by mail.sigma-star.at (Postfix) with ESMTPSA id CAF6A16B50AD; Thu, 1 Dec 2016 23:02:34 +0100 (CET) From: Richard Weinberger To: linux-mtd@lists.infradead.org Cc: david@sigma-star.at, tytso@mit.edu, dedekind1@gmail.com, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, adilger.kernel@dilger.ca, akpm@linux-foundation.org, linux-ext4@vger.kernel.org, Richard Weinberger Subject: [PATCH 4/6] ubifs: Maintain a parent pointer Date: Thu, 1 Dec 2016 23:02:19 +0100 Message-Id: <1480629741-18375-5-git-send-email-richard@nod.at> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1480629741-18375-1-git-send-email-richard@nod.at> References: <1480629741-18375-1-git-send-email-richard@nod.at> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The new feature UBIFS_FLG_PARENTPOINTER allows looking up the parent. Usually the Linux VFS walks down the filesystem and no parent pointers are needed. But when a filesystem is exportable via NFS such a lookup is needed. We can use a padding field in struct ubifs_ino_node to maintain a pointer to the parent inode. Signed-off-by: Richard Weinberger --- fs/ubifs/dir.c | 21 ++++++++++++++++++++- fs/ubifs/journal.c | 5 ++++- fs/ubifs/sb.c | 2 ++ fs/ubifs/super.c | 1 + fs/ubifs/ubifs-media.h | 12 +++++++++--- fs/ubifs/ubifs.h | 4 ++++ 6 files changed, 40 insertions(+), 5 deletions(-) diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 3b8c08dad75b..5485d836af21 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -171,6 +171,7 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, struct inode *dir, } inode->i_ino = ++c->highest_inum; + ui->parent_inum = inode->i_ino; /* * The creation sequence number remains with this inode for its * lifetime. All nodes for this inode have a greater sequence number, @@ -1409,7 +1410,7 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, if (unlink) ubifs_assert(inode_is_locked(new_inode)); - if (old_dir != new_dir) { + if (move) { if (ubifs_crypt_is_encrypted(new_dir) && !fscrypt_has_permitted_context(new_dir, old_inode)) return -EPERM; @@ -1563,8 +1564,12 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, mark_inode_dirty(whiteout); whiteout->i_state &= ~I_LINKABLE; iput(whiteout); + whiteout_ui->parent_inum = new_dir->i_ino; } + if (move) + old_inode_ui->parent_inum = new_dir->i_ino; + err = ubifs_jnl_rename(c, old_dir, old_inode, &old_nm, new_dir, new_inode, &new_nm, whiteout, sync); if (err) @@ -1606,6 +1611,8 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, inc_nlink(old_dir); } } + if (move) + old_inode_ui->parent_inum = old_dir->i_ino; if (whiteout) { drop_nlink(whiteout); iput(whiteout); @@ -1627,6 +1634,8 @@ static int ubifs_xrename(struct inode *old_dir, struct dentry *old_dentry, int sync = IS_DIRSYNC(old_dir) || IS_DIRSYNC(new_dir); struct inode *fst_inode = d_inode(old_dentry); struct inode *snd_inode = d_inode(new_dentry); + struct ubifs_inode *fst_inode_ui = ubifs_inode(fst_inode); + struct ubifs_inode *snd_inode_ui = ubifs_inode(snd_inode); struct timespec time; int err; struct fscrypt_name fst_nm, snd_nm; @@ -1658,6 +1667,11 @@ static int ubifs_xrename(struct inode *old_dir, struct dentry *old_dentry, old_dir->i_mtime = old_dir->i_ctime = time; new_dir->i_mtime = new_dir->i_ctime = time; + if (new_dir != old_dir) { + fst_inode_ui->parent_inum = new_dir->i_ino; + snd_inode_ui->parent_inum = old_dir->i_ino; + } + if (old_dir != new_dir) { if (S_ISDIR(fst_inode->i_mode) && !S_ISDIR(snd_inode->i_mode)) { inc_nlink(new_dir); @@ -1672,6 +1686,11 @@ static int ubifs_xrename(struct inode *old_dir, struct dentry *old_dentry, err = ubifs_jnl_xrename(c, old_dir, fst_inode, &fst_nm, new_dir, snd_inode, &snd_nm, sync); + if (err && new_dir != old_dir) { + fst_inode_ui->parent_inum = old_dir->i_ino; + snd_inode_ui->parent_inum = new_dir->i_ino; + } + unlock_4_inodes(old_dir, new_dir, NULL, NULL); ubifs_release_budget(c, &req); diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c index a459211a1c21..4a76c14fb07c 100644 --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c @@ -66,7 +66,6 @@ */ static inline void zero_ino_node_unused(struct ubifs_ino_node *ino) { - memset(ino->padding1, 0, 4); memset(ino->padding2, 0, 26); } @@ -470,6 +469,10 @@ static void pack_inode(struct ubifs_info *c, struct ubifs_ino_node *ino, ino->xattr_cnt = cpu_to_le32(ui->xattr_cnt); ino->xattr_size = cpu_to_le32(ui->xattr_size); ino->xattr_names = cpu_to_le32(ui->xattr_names); + if (c->parent_pointer) + ino->parent_inum = cpu_to_le32(ui->parent_inum); + else + ino->parent_inum = 0; zero_ino_node_unused(ino); /* diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c index 7f1ead29e727..f012cd411382 100644 --- a/fs/ubifs/sb.c +++ b/fs/ubifs/sb.c @@ -164,6 +164,7 @@ static int create_default_filesystem(struct ubifs_info *c) if (big_lpt) sup_flags |= UBIFS_FLG_BIGLPT; sup_flags |= UBIFS_FLG_DOUBLE_HASH; + sup_flags |= UBIFS_FLG_PARENTPOINTER; sup->ch.node_type = UBIFS_SB_NODE; sup->key_hash = UBIFS_KEY_HASH_R5; @@ -633,6 +634,7 @@ int ubifs_read_superblock(struct ubifs_info *c) c->space_fixup = !!(sup_flags & UBIFS_FLG_SPACE_FIXUP); c->double_hash = !!(sup_flags & UBIFS_FLG_DOUBLE_HASH); c->encrypted = !!(sup_flags & UBIFS_FLG_ENCRYPTION); + c->parent_pointer = !!(sup_flags & UBIFS_FLG_PARENTPOINTER); if ((sup_flags & ~UBIFS_FLG_MASK) != 0) { ubifs_err(c, "Unknown feature flags found: %#x", diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index e08aa04fc835..c50952f43e36 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -154,6 +154,7 @@ struct inode *ubifs_iget(struct super_block *sb, unsigned long inum) ui->synced_i_size = ui->ui_size = inode->i_size; ui->xattr = (ui->flags & UBIFS_XATTR_FL) ? 1 : 0; + ui->parent_inum = le32_to_cpu(ino->parent_inum); err = validate_inode(c, inode); if (err) diff --git a/fs/ubifs/ubifs-media.h b/fs/ubifs/ubifs-media.h index 5939776c7359..b3cb76cedf20 100644 --- a/fs/ubifs/ubifs-media.h +++ b/fs/ubifs/ubifs-media.h @@ -427,15 +427,21 @@ enum { * UBIFS_FLG_DOUBLE_HASH: store a 32bit cookie in directory entry nodes to * support 64bit cookies for lookups by hash * UBIFS_FLG_ENCRYPTION: this filesystem contains encrypted files + * UBIFS_FLG_PARENTPOINTER: inode nodes maintain a pointer to the parent dir */ enum { UBIFS_FLG_BIGLPT = 0x02, UBIFS_FLG_SPACE_FIXUP = 0x04, UBIFS_FLG_DOUBLE_HASH = 0x08, UBIFS_FLG_ENCRYPTION = 0x10, + UBIFS_FLG_PARENTPOINTER = 0x20, }; -#define UBIFS_FLG_MASK (UBIFS_FLG_BIGLPT|UBIFS_FLG_SPACE_FIXUP|UBIFS_FLG_DOUBLE_HASH|UBIFS_FLG_ENCRYPTION) +#define UBIFS_FLG_MASK (UBIFS_FLG_BIGLPT \ + |UBIFS_FLG_SPACE_FIXUP \ + |UBIFS_FLG_DOUBLE_HASH \ + |UBIFS_FLG_ENCRYPTION \ + |UBIFS_FLG_PARENTPOINTER) /** * struct ubifs_ch - common header node. @@ -494,7 +500,7 @@ union ubifs_dev_desc { * @data_len: inode data length * @xattr_cnt: count of extended attributes this inode has * @xattr_size: summarized size of all extended attributes in bytes - * @padding1: reserved for future, zeroes + * @parent_inum: parent inode number * @xattr_names: sum of lengths of all extended attribute names belonging to * this inode * @compr_type: compression type used for this inode @@ -528,7 +534,7 @@ struct ubifs_ino_node { __le32 data_len; __le32 xattr_cnt; __le32 xattr_size; - __u8 padding1[4]; /* Watch 'zero_ino_node_unused()' if changing! */ + __le32 parent_inum; __le32 xattr_names; __le16 compr_type; __u8 padding2[26]; /* Watch 'zero_ino_node_unused()' if changing! */ diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 0532a6f82b1d..e1b7531650af 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -353,6 +353,7 @@ struct ubifs_gced_idx_leb { * currently stored on the flash; used only for regular file * inodes * @ui_size: inode size used by UBIFS when writing to flash + * @parent_inum: inode number of the parent directory * @flags: inode flags (@UBIFS_COMPR_FL, etc) * @compr_type: default compression type used for this inode * @last_page_read: page number of last page read (for bulk read) @@ -404,6 +405,7 @@ struct ubifs_inode { spinlock_t ui_lock; loff_t synced_i_size; loff_t ui_size; + ino_t parent_inum; int flags; pgoff_t last_page_read; pgoff_t read_in_a_row; @@ -1018,6 +1020,7 @@ struct ubifs_debug_info; * @space_fixup: flag indicating that free space in LEBs needs to be cleaned up * @double_hash: flag indicating that we can do lookups by hash * @encrypted: flag indicating that this file system contains encrypted files + * @parent_pointer: flag indicating that inodes have pointers to the parent dir * @no_chk_data_crc: do not check CRCs when reading data nodes (except during * recovery) * @bulk_read: enable bulk-reads @@ -1262,6 +1265,7 @@ struct ubifs_info { unsigned int space_fixup:1; unsigned int double_hash:1; unsigned int encrypted:1; + unsigned int parent_pointer:1; unsigned int no_chk_data_crc:1; unsigned int bulk_read:1; unsigned int default_compr:2;