diff options
Diffstat (limited to 'fs/ecryptfs')
-rw-r--r-- | fs/ecryptfs/crypto.c | 2 | ||||
-rw-r--r-- | fs/ecryptfs/debug.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c index 4f7d89591970..129ed13f8253 100644 --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c | |||
@@ -1267,8 +1267,6 @@ static int ecryptfs_read_header_region(char *data, struct dentry *dentry, | |||
1267 | lower_file->f_pos = 0; | 1267 | lower_file->f_pos = 0; |
1268 | oldfs = get_fs(); | 1268 | oldfs = get_fs(); |
1269 | set_fs(get_ds()); | 1269 | set_fs(get_ds()); |
1270 | /* For releases 0.1 and 0.2, all of the header information | ||
1271 | * fits in the first data extent-sized region. */ | ||
1272 | rc = lower_file->f_op->read(lower_file, (char __user *)data, | 1270 | rc = lower_file->f_op->read(lower_file, (char __user *)data, |
1273 | ECRYPTFS_DEFAULT_EXTENT_SIZE, &lower_file->f_pos); | 1271 | ECRYPTFS_DEFAULT_EXTENT_SIZE, &lower_file->f_pos); |
1274 | set_fs(oldfs); | 1272 | set_fs(oldfs); |
diff --git a/fs/ecryptfs/debug.c b/fs/ecryptfs/debug.c index 434c7efd80f8..3d2bdf546ec6 100644 --- a/fs/ecryptfs/debug.c +++ b/fs/ecryptfs/debug.c | |||
@@ -38,8 +38,6 @@ void ecryptfs_dump_auth_tok(struct ecryptfs_auth_tok *auth_tok) | |||
38 | auth_tok); | 38 | auth_tok); |
39 | if (auth_tok->flags & ECRYPTFS_PRIVATE_KEY) { | 39 | if (auth_tok->flags & ECRYPTFS_PRIVATE_KEY) { |
40 | ecryptfs_printk(KERN_DEBUG, " * private key type\n"); | 40 | ecryptfs_printk(KERN_DEBUG, " * private key type\n"); |
41 | ecryptfs_printk(KERN_DEBUG, " * (NO PRIVATE KEY SUPPORT " | ||
42 | "IN ECRYPTFS VERSION 0.1)\n"); | ||
43 | } else { | 41 | } else { |
44 | ecryptfs_printk(KERN_DEBUG, " * passphrase type\n"); | 42 | ecryptfs_printk(KERN_DEBUG, " * passphrase type\n"); |
45 | ecryptfs_to_hex(salt, auth_tok->token.password.salt, | 43 | ecryptfs_to_hex(salt, auth_tok->token.password.salt, |