Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-29 06:12:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fscrypt: Rename FS_WRITE_PATH_FL to FS_CTX_HAS_BOUNCE_BUFFER_FL

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

Signed-off-by: David Gstir <david@sigma-star.at>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
David Gstir 2016-12-06 23:53:58 +01:00 committed by Theodore Ts'o
parent f32d7ac20a
commit 6a34e4d2be
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/crypto/crypto.c
View File

@ -63,7 +63,7 @@ void fscrypt_release_ctx(struct fscrypt_ctx *ctx)
{ {
unsigned long flags; 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); mempool_free(ctx->w.bounce_page, fscrypt_bounce_page_pool);
ctx->w.bounce_page = NULL; ctx->w.bounce_page = NULL;
} }
@ -121,7 +121,7 @@ struct fscrypt_ctx *fscrypt_get_ctx(const struct inode *inode, gfp_t gfp_flags)
} else { } else {
ctx->flags &= ~FS_CTX_REQUIRES_FREE_ENCRYPT_FL; ctx->flags &= ~FS_CTX_REQUIRES_FREE_ENCRYPT_FL;
} }
ctx->flags &= ~FS_WRITE_PATH_FL; ctx->flags &= ~FS_CTX_HAS_BOUNCE_BUFFER_FL;
return ctx; return ctx;
} }
EXPORT_SYMBOL(fscrypt_get_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); ctx->w.bounce_page = mempool_alloc(fscrypt_bounce_page_pool, gfp_flags);
if (ctx->w.bounce_page == NULL) if (ctx->w.bounce_page == NULL)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
ctx->flags |= FS_WRITE_PATH_FL; ctx->flags |= FS_CTX_HAS_BOUNCE_BUFFER_FL;
return ctx->w.bounce_page; return ctx->w.bounce_page;
} }

2
fs/crypto/fscrypt_private.h
View File

@ -72,7 +72,7 @@ struct fscrypt_info {
}; };
#define FS_CTX_REQUIRES_FREE_ENCRYPT_FL 0x00000001 #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 fscrypt_completion_result {
struct completion completion; struct completion completion;

1
include/linux/fscrypto.h
View File

@ -21,7 +21,6 @@
#define FS_CRYPTO_BLOCK_SIZE 16 #define FS_CRYPTO_BLOCK_SIZE 16
struct fscrypt_info; struct fscrypt_info;
struct fscrypt_ctx;
struct fscrypt_ctx { struct fscrypt_ctx {
union { union {