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

Commit d0d1db1b authored by Paul Lawrence's avatar Paul Lawrence
Browse files

ANDROID: Incremental fs: Remove C++-style comments 



Change-Id: I89e1dc6020e596fb36694f8646f78b98f7ad4a7f
Bug: 133435829
Signed-off-by: default avatarPaul Lawrence <paullawrence@google.com>
parent 312ed39a

fs/incfs/vfs.c

+7 −7
Original line number Diff line number Diff line
@@ -868,9 +868,10 @@ static struct signature_info *incfs_copy_signature_info_from_user( 
			goto err;

		}



		// TODO this sets the root_hash length to MAX_HASH_SIZE not

		// the actual size. Fix, then set INCFS_MAX_HASH_SIZE back

		// to 64

		/* TODO this sets the root_hash length to MAX_HASH_SIZE not

		 * the actual size. Fix, then set INCFS_MAX_HASH_SIZE back

		 * to 64

		 */

		result->root_hash = range(p, INCFS_MAX_HASH_SIZE);

		if (copy_from_user(p, u64_to_user_ptr(usr_si.root_hash),

				result->root_hash.len) > 0) {
@@ -1005,8 +1006,9 @@ static int init_new_file(struct mount_info *mi, struct dentry *dentry, 
				goto out;

			}



			// TODO This code seems wrong when len is zero - we

			// should error out??

			/* TODO This code seems wrong when len is zero - we

			 * should error out??

			 */

			if (si->signature.len > 0)

				error = incfs_validate_pkcs7_signature(

						si->signature,
@@ -1114,8 +1116,6 @@ static int dir_relative_path_resolve( 
		LOOKUP_FOLLOW | LOOKUP_DIRECTORY, result_path, NULL);



out:

	// TODO sys_close should be replaced with ksys_close on later kernel

	// Add to compat or some such?

	sys_close(dir_fd);

	if (error)

		pr_debug("incfs: %s %d\n", __func__, error);

include/uapi/linux/incrementalfs.h

+3 −2
Original line number Diff line number Diff line
@@ -22,8 +22,9 @@ 
#define INCFS_DATA_FILE_BLOCK_SIZE 4096

#define INCFS_HEADER_VER 1



// TODO: This value is assumed in incfs_copy_signature_info_from_user to be the

// actual signature length. Set back to 64 when fixed.

/* TODO: This value is assumed in incfs_copy_signature_info_from_user to be the

 * actual signature length. Set back to 64 when fixed.

 */

#define INCFS_MAX_HASH_SIZE 32

#define INCFS_MAX_FILE_ATTR_SIZE 512