git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
fs
/
ceph
/
super.c
diff --git
a/fs/ceph/super.c
b/fs/ceph/super.c
index
a9e78b4
..
f2f77fd
100644
(file)
--- a/
fs/ceph/super.c
+++ b/
fs/ceph/super.c
@@
-353,7
+353,7
@@
static int ceph_show_options(struct seq_file *m, struct vfsmount *mnt)
if (opt->name)
seq_printf(m, ",name=%s", opt->name);
- if (opt->
secret
)
+ if (opt->
key
)
seq_puts(m, ",secret=<hidden>");
if (opt->mount_timeout != CEPH_MOUNT_TIMEOUT_DEFAULT)