Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a34e4d2 authored by David Gstir's avatar David Gstir Committed by Theodore Ts'o
Browse files

fscrypt: Rename FS_WRITE_PATH_FL to FS_CTX_HAS_BOUNCE_BUFFER_FL 



... to better explain its purpose after introducing in-place encryption
without bounce buffer.

Signed-off-by: default avatarDavid Gstir <david@sigma-star.at>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent f32d7ac2

fs/crypto/crypto.c

+3 −3
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ void fscrypt_release_ctx(struct fscrypt_ctx *ctx) 
{

	unsigned long flags;



	if (ctx->flags & FS_WRITE_PATH_FL && ctx->w.bounce_page) {

	if (ctx->flags & FS_CTX_HAS_BOUNCE_BUFFER_FL && ctx->w.bounce_page) {

		mempool_free(ctx->w.bounce_page, fscrypt_bounce_page_pool);

		ctx->w.bounce_page = NULL;

	}
@@ -121,7 +121,7 @@ struct fscrypt_ctx *fscrypt_get_ctx(const struct inode *inode, gfp_t gfp_flags) 
	} else {

		ctx->flags &= ~FS_CTX_REQUIRES_FREE_ENCRYPT_FL;

	}

	ctx->flags &= ~FS_WRITE_PATH_FL;

	ctx->flags &= ~FS_CTX_HAS_BOUNCE_BUFFER_FL;

	return ctx;

}

EXPORT_SYMBOL(fscrypt_get_ctx);
@@ -210,7 +210,7 @@ static struct page *alloc_bounce_page(struct fscrypt_ctx *ctx, gfp_t gfp_flags) 
	ctx->w.bounce_page = mempool_alloc(fscrypt_bounce_page_pool, gfp_flags);

	if (ctx->w.bounce_page == NULL)

		return ERR_PTR(-ENOMEM);

	ctx->flags |= FS_WRITE_PATH_FL;

	ctx->flags |= FS_CTX_HAS_BOUNCE_BUFFER_FL;

	return ctx->w.bounce_page;

}

fs/crypto/fscrypt_private.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ struct fscrypt_info { 
};



#define FS_CTX_REQUIRES_FREE_ENCRYPT_FL		0x00000001

#define FS_WRITE_PATH_FL			0x00000002

#define FS_CTX_HAS_BOUNCE_BUFFER_FL		0x00000002



struct fscrypt_completion_result {

	struct completion completion;

include/linux/fscrypto.h

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#define FS_CRYPTO_BLOCK_SIZE		16



struct fscrypt_info;

struct fscrypt_ctx;



struct fscrypt_ctx {

	union {