| Message ID | 20191024215438.138489-4-ebiggers@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | fscrypt: support for IV_INO_LBLK_64 policies | expand |
On 10/24, Eric Biggers wrote: > From: Eric Biggers <ebiggers@google.com> > > f2fs inode numbers are stable across filesystem resizing, and f2fs inode > and file logical block numbers are always 32-bit. So f2fs can always > support IV_INO_LBLK_64 encryption policies. Wire up the needed > fscrypt_operations to declare support. > > Signed-off-by: Eric Biggers <ebiggers@google.com> Acked-by: Jaegeuk Kim <jaegeuk@kernel.org> > --- > fs/f2fs/super.c | 26 ++++++++++++++++++++------ > 1 file changed, 20 insertions(+), 6 deletions(-) > > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c > index 1443cee158633..851ac95229263 100644 > --- a/fs/f2fs/super.c > +++ b/fs/f2fs/super.c > @@ -2308,13 +2308,27 @@ static bool f2fs_dummy_context(struct inode *inode) > return DUMMY_ENCRYPTION_ENABLED(F2FS_I_SB(inode)); > } > > +static bool f2fs_has_stable_inodes(struct super_block *sb) > +{ > + return true; > +} > + > +static void f2fs_get_ino_and_lblk_bits(struct super_block *sb, > + int *ino_bits_ret, int *lblk_bits_ret) > +{ > + *ino_bits_ret = 8 * sizeof(nid_t); > + *lblk_bits_ret = 8 * sizeof(block_t); > +} > + > static const struct fscrypt_operations f2fs_cryptops = { > - .key_prefix = "f2fs:", > - .get_context = f2fs_get_context, > - .set_context = f2fs_set_context, > - .dummy_context = f2fs_dummy_context, > - .empty_dir = f2fs_empty_dir, > - .max_namelen = F2FS_NAME_LEN, > + .key_prefix = "f2fs:", > + .get_context = f2fs_get_context, > + .set_context = f2fs_set_context, > + .dummy_context = f2fs_dummy_context, > + .empty_dir = f2fs_empty_dir, > + .max_namelen = F2FS_NAME_LEN, > + .has_stable_inodes = f2fs_has_stable_inodes, > + .get_ino_and_lblk_bits = f2fs_get_ino_and_lblk_bits, > }; > #endif > > -- > 2.24.0.rc0.303.g954a862665-goog
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 1443cee158633..851ac95229263 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2308,13 +2308,27 @@ static bool f2fs_dummy_context(struct inode *inode) return DUMMY_ENCRYPTION_ENABLED(F2FS_I_SB(inode)); } +static bool f2fs_has_stable_inodes(struct super_block *sb) +{ + return true; +} + +static void f2fs_get_ino_and_lblk_bits(struct super_block *sb, + int *ino_bits_ret, int *lblk_bits_ret) +{ + *ino_bits_ret = 8 * sizeof(nid_t); + *lblk_bits_ret = 8 * sizeof(block_t); +} + static const struct fscrypt_operations f2fs_cryptops = { - .key_prefix = "f2fs:", - .get_context = f2fs_get_context, - .set_context = f2fs_set_context, - .dummy_context = f2fs_dummy_context, - .empty_dir = f2fs_empty_dir, - .max_namelen = F2FS_NAME_LEN, + .key_prefix = "f2fs:", + .get_context = f2fs_get_context, + .set_context = f2fs_set_context, + .dummy_context = f2fs_dummy_context, + .empty_dir = f2fs_empty_dir, + .max_namelen = F2FS_NAME_LEN, + .has_stable_inodes = f2fs_has_stable_inodes, + .get_ino_and_lblk_bits = f2fs_get_ino_and_lblk_bits, }; #endif