diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-01-08 10:05:41 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-01-08 10:05:41 +1100 |
| commit | 478f3919a7c87fa3f67757e86dfb5018f5f2c6ea (patch) | |
| tree | 6f49264d3f27386a91ddd176940a786572cebd41 | |
| parent | 8b1f3f74b1c167908bf5279704edd7fc371324b9 (diff) | |
| parent | a3d78fe3e1ae8c6a1901635c54a1a799656f72c8 (diff) | |
| download | linux-next-478f3919a7c87fa3f67757e86dfb5018f5f2c6ea.tar.gz | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git
| -rw-r--r-- | fs/ecryptfs/crypto.c | 2 | ||||
| -rw-r--r-- | fs/ecryptfs/keystore.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c index 03bd55069d8600..044863c0d8243c 100644 --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c @@ -1289,7 +1289,7 @@ out: /** * ecryptfs_read_xattr_region - * @page_virt: The vitual address into which to read the xattr data + * @page_virt: The virtual address into which to read the xattr data * @ecryptfs_inode: The eCryptfs inode * * Attempts to read the crypto metadata from the extended attribute diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c index 3fe41964c0d8d9..2452d6fd7062d7 100644 --- a/fs/ecryptfs/keystore.c +++ b/fs/ecryptfs/keystore.c @@ -878,7 +878,7 @@ struct ecryptfs_parse_tag_70_packet_silly_stack { * @filename: This function kmalloc's the memory for the filename * @filename_size: This function sets this to the amount of memory * kmalloc'd for the filename - * @packet_size: This function sets this to the the number of octets + * @packet_size: This function sets this to the number of octets * in the packet parsed * @mount_crypt_stat: The mount-wide cryptographic context * @data: The memory location containing the start of the tag 70 |