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

Commit 411771ab authored by Eric Biggers's avatar Eric Biggers Committed by Jaegeuk Kim
Browse files

fscrypt: move fscrypt_is_dot_dotdot() to fs/crypto/fname.c 



Only fs/crypto/fname.c cares about treating the "." and ".." filenames
specially with regards to encryption, so move fscrypt_is_dot_dotdot()
from fscrypt.h to there.

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

fs/crypto/fname.c

+11 −0
Original line number Diff line number Diff line
@@ -15,6 +15,17 @@ 
#include <linux/ratelimit.h>

#include "fscrypt_private.h"



static inline bool fscrypt_is_dot_dotdot(const struct qstr *str)

{

	if (str->len == 1 && str->name[0] == '.')

		return true;



	if (str->len == 2 && str->name[0] == '.' && str->name[1] == '.')

		return true;



	return false;

}



/**

 * fname_encrypt() - encrypt a filename

 *

include/linux/fscrypt.h

+0 −11
Original line number Diff line number Diff line
@@ -57,17 +57,6 @@ struct fscrypt_name { 
/* Maximum value for the third parameter of fscrypt_operations.set_context(). */

#define FSCRYPT_SET_CONTEXT_MAX_SIZE	28



static inline bool fscrypt_is_dot_dotdot(const struct qstr *str)

{

	if (str->len == 1 && str->name[0] == '.')

		return true;



	if (str->len == 2 && str->name[0] == '.' && str->name[1] == '.')

		return true;



	return false;

}



#if __FS_HAS_ENCRYPTION

#include <linux/fscrypt_supp.h>

#else