From 5d3d8b69ef2f23683c86ce154172216f2339b7bd Mon Sep 17 00:00:00 2001 From: Tyler Hicks Date: Mon, 16 Mar 2009 12:35:12 -0500 Subject: [PATCH] --- yaml --- r: 144030 b: refs/heads/master c: 3a5203ab3c0c31e0f1434c69e893bfb85c6e6657 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ecryptfs/super.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9880fc1521c0..3e450e3d3e1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57ea34d19963781d05eb12f9b31bd4f70d61ec16 +refs/heads/master: 3a5203ab3c0c31e0f1434c69e893bfb85c6e6657 diff --git a/trunk/fs/ecryptfs/super.c b/trunk/fs/ecryptfs/super.c index c27ac2b358a1..b5003023f106 100644 --- a/trunk/fs/ecryptfs/super.c +++ b/trunk/fs/ecryptfs/super.c @@ -170,7 +170,10 @@ static int ecryptfs_show_options(struct seq_file *m, struct vfsmount *mnt) list_for_each_entry(walker, &mount_crypt_stat->global_auth_tok_list, mount_crypt_stat_list) { - seq_printf(m, ",ecryptfs_sig=%s", walker->sig); + if (walker->flags & ECRYPTFS_AUTH_TOK_FNEK) + seq_printf(m, ",ecryptfs_fnek_sig=%s", walker->sig); + else + seq_printf(m, ",ecryptfs_sig=%s", walker->sig); } mutex_unlock(&mount_crypt_stat->global_auth_tok_list_mutex);