Commit bdd23476 authored by Eric Biggers's avatar Eric Biggers Committed by Theodore Ts'o
Browse files

fscrypt: move fscrypt_operations declaration to fscrypt_supp.h 



Filesystems now only define their fscrypt_operations when they are
compiled with encryption support, so move the fscrypt_operations
declaration from fscrypt.h to fscrypt_supp.h.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 1493651b

include/linux/fscrypt.h

+0 −18
Original line number Diff line number Diff line
@@ -54,24 +54,6 @@ struct fscrypt_name { 
#define fname_name(p)		((p)->disk_name.name)

#define fname_len(p)		((p)->disk_name.len)



/*

 * fscrypt superblock flags

 */

#define FS_CFLG_OWN_PAGES (1U << 1)



/*

 * crypto opertions for filesystems

 */

struct fscrypt_operations {

	unsigned int flags;

	const char *key_prefix;

	int (*get_context)(struct inode *, void *, size_t);

	int (*set_context)(struct inode *, const void *, size_t, void *);

	bool (*dummy_context)(struct inode *);

	bool (*empty_dir)(struct inode *);

	unsigned (*max_namelen)(struct inode *);

};



/* Maximum value for the third parameter of fscrypt_operations.set_context(). */

#define FSCRYPT_SET_CONTEXT_MAX_SIZE	28

include/linux/fscrypt_supp.h

+18 −0
Original line number Diff line number Diff line
@@ -11,6 +11,24 @@ 
#ifndef _LINUX_FSCRYPT_SUPP_H

#define _LINUX_FSCRYPT_SUPP_H



/*

 * fscrypt superblock flags

 */

#define FS_CFLG_OWN_PAGES (1U << 1)



/*

 * crypto operations for filesystems

 */

struct fscrypt_operations {

	unsigned int flags;

	const char *key_prefix;

	int (*get_context)(struct inode *, void *, size_t);

	int (*set_context)(struct inode *, const void *, size_t, void *);

	bool (*dummy_context)(struct inode *);

	bool (*empty_dir)(struct inode *);

	unsigned (*max_namelen)(struct inode *);

};



struct fscrypt_ctx {

	union {

		struct {