From: Kyungchan Koh <kkc6196@fb.com>
To: <tytso@mit.edu>, <adilger.kernel@dilger.ca>,
<linux-ext4@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <kernel-team@fb.com>
Subject: [PATCH] fs: ext4: inode->i_generation not assigned 0.
Date: Wed, 28 Jun 2017 15:06:42 -0700 [thread overview]
Message-ID: <c9f7090b2a58364998ad4a49cfdac379b905c7e9.1498687302.git.kkc6196@fb.com> (raw)
In fs/ext4/super.c, the function ext4_nfs_get_inode takes as input
"generation" that can be used to specify the generation of the inode to
be returned. When 0 is given as input, then inodes of any generation can
be returned. Therefore, generation 0 is a special case that should be
avoided when assigning generation to inodes.
A new inline function, ext4_inode_set_gen, will take care of the
problem. Now, inodes cannot have a generation of 0, so this patch fixes
the issue.
Signed-off-by: Kyungchan Koh <kkc6196@fb.com>
---
fs/ext4/ext4.h | 8 ++++++++
fs/ext4/ialloc.c | 2 +-
fs/ext4/ioctl.c | 4 ++--
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 3219154..74c6677 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -1549,6 +1549,14 @@ static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino)
ino <= le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count));
}
+static inline void ext4_inode_set_gen(struct inode *inode,
+ struct ext4_sb_info *sbi)
+{
+ inode->i_generation = sbi->s_next_generation++;
+ if (!inode->i_generation)
+ inode->i_generation = sbi->s_next_generation++;
+}
+
/*
* Inode dynamic state flags
*/
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 98ac2f1..d33f6f0 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -1072,7 +1072,7 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir,
goto out;
}
spin_lock(&sbi->s_next_gen_lock);
- inode->i_generation = sbi->s_next_generation++;
+ ext4_inode_set_gen(inode, sbi);
spin_unlock(&sbi->s_next_gen_lock);
/* Precompute checksum seed for inode metadata */
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 0c21e22..d52a467 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -160,8 +160,8 @@ static long swap_inode_boot_loader(struct super_block *sb,
inode->i_ctime = inode_bl->i_ctime = current_time(inode);
spin_lock(&sbi->s_next_gen_lock);
- inode->i_generation = sbi->s_next_generation++;
- inode_bl->i_generation = sbi->s_next_generation++;
+ ext4_inode_set_gen(inode, sbi);
+ ext4_inode_set_gen(inode_bl, sbi);
spin_unlock(&sbi->s_next_gen_lock);
ext4_discard_preallocations(inode);
--
2.9.3
next reply other threads:[~2017-06-28 22:06 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-28 22:06 Kyungchan Koh [this message]
2017-06-29 0:48 ` [PATCH] fs: ext4: inode->i_generation not assigned 0 Darrick J. Wong
2017-06-29 0:58 ` William Koh
2017-06-29 2:32 ` Andreas Dilger
2017-06-29 4:37 ` William Koh
2017-06-29 4:59 ` Darrick J. Wong
2017-06-29 14:28 ` William Koh
2017-06-29 14:35 ` J. Bruce Fields
2017-06-29 17:25 ` Darrick J. Wong
2017-06-29 18:30 ` J. Bruce Fields
2017-06-29 18:50 ` J. Bruce Fields
2017-07-04 4:04 ` Darrick J. Wong
2017-07-05 1:15 ` J. Bruce Fields
2017-07-05 19:19 ` Darrick J. Wong
2017-07-05 20:27 ` Theodore Ts'o
2017-07-07 10:51 ` Jeff Layton
2017-07-07 15:51 ` Theodore Ts'o
2017-07-07 16:13 ` Jeff Layton
2017-07-07 16:47 ` J. Bruce Fields
2017-07-05 20:49 ` J. Bruce Fields
2017-07-06 1:08 ` NeilBrown
2017-07-06 2:39 ` J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c9f7090b2a58364998ad4a49cfdac379b905c7e9.1498687302.git.kkc6196@fb.com \
--to=kkc6196@fb.com \
--cc=adilger.kernel@dilger.ca \
--cc=kernel-team@fb.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).