Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(407)

Side by Side Diff: fs/ecryptfs/ecryptfs_kernel.h

Issue 6720011: Revert "ecryptfs: modify write path to encrypt page in writepage" (Closed) Base URL: http://git.chromium.org/git/kernel.git@master
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | fs/ecryptfs/file.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /** 1 /**
2 * eCryptfs: Linux filesystem encryption layer 2 * eCryptfs: Linux filesystem encryption layer
3 * Kernel declarations. 3 * Kernel declarations.
4 * 4 *
5 * Copyright (C) 1997-2003 Erez Zadok 5 * Copyright (C) 1997-2003 Erez Zadok
6 * Copyright (C) 2001-2003 Stony Brook University 6 * Copyright (C) 2001-2003 Stony Brook University
7 * Copyright (C) 2004-2008 International Business Machines Corp. 7 * Copyright (C) 2004-2008 International Business Machines Corp.
8 * Author(s): Michael A. Halcrow <mahalcro@us.ibm.com> 8 * Author(s): Michael A. Halcrow <mahalcro@us.ibm.com>
9 * Trevor S. Highland <trevor.highland@gmail.com> 9 * Trevor S. Highland <trevor.highland@gmail.com>
10 * Tyler Hicks <tyhicks@ou.edu> 10 * Tyler Hicks <tyhicks@ou.edu>
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 struct mutex cs_tfm_mutex; 290 struct mutex cs_tfm_mutex;
291 struct mutex cs_hash_tfm_mutex; 291 struct mutex cs_hash_tfm_mutex;
292 struct mutex cs_mutex; 292 struct mutex cs_mutex;
293 }; 293 };
294 294
295 /* inode private data. */ 295 /* inode private data. */
296 struct ecryptfs_inode_info { 296 struct ecryptfs_inode_info {
297 struct inode vfs_inode; 297 struct inode vfs_inode;
298 struct inode *wii_inode; 298 struct inode *wii_inode;
299 struct file *lower_file; 299 struct file *lower_file;
300 struct mutex lower_file_mutex;
300 struct ecryptfs_crypt_stat crypt_stat; 301 struct ecryptfs_crypt_stat crypt_stat;
301 }; 302 };
302 303
303 /* dentry private data. Each dentry must keep track of a lower 304 /* dentry private data. Each dentry must keep track of a lower
304 * vfsmount too. */ 305 * vfsmount too. */
305 struct ecryptfs_dentry_info { 306 struct ecryptfs_dentry_info {
306 struct path lower_path; 307 struct path lower_path;
307 struct ecryptfs_crypt_stat *crypt_stat; 308 struct ecryptfs_crypt_stat *crypt_stat;
308 }; 309 };
309 310
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 char *filename, size_t filename_size); 757 char *filename, size_t filename_size);
757 int 758 int
758 ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size, 759 ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,
759 size_t *packet_size, 760 size_t *packet_size,
760 struct ecryptfs_mount_crypt_stat *mount_crypt_stat, 761 struct ecryptfs_mount_crypt_stat *mount_crypt_stat,
761 char *data, size_t max_packet_size); 762 char *data, size_t max_packet_size);
762 int ecryptfs_derive_iv(char *iv, struct ecryptfs_crypt_stat *crypt_stat, 763 int ecryptfs_derive_iv(char *iv, struct ecryptfs_crypt_stat *crypt_stat,
763 loff_t offset); 764 loff_t offset);
764 765
765 #endif /* #ifndef ECRYPTFS_KERNEL_H */ 766 #endif /* #ifndef ECRYPTFS_KERNEL_H */
OLDNEW
« no previous file with comments | « no previous file | fs/ecryptfs/file.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698