diff options
Diffstat (limited to 'fs/ecryptfs/main.c')
-rw-r--r-- | fs/ecryptfs/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index f36ab2feea28..8876fe7c76e2 100644 --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c | |||
@@ -248,10 +248,11 @@ static int ecryptfs_init_global_auth_toks( | |||
248 | "session keyring for sig specified in mount " | 248 | "session keyring for sig specified in mount " |
249 | "option: [%s]\n", global_auth_tok->sig); | 249 | "option: [%s]\n", global_auth_tok->sig); |
250 | global_auth_tok->flags |= ECRYPTFS_AUTH_TOK_INVALID; | 250 | global_auth_tok->flags |= ECRYPTFS_AUTH_TOK_INVALID; |
251 | rc = 0; | 251 | goto out; |
252 | } else | 252 | } else |
253 | global_auth_tok->flags &= ~ECRYPTFS_AUTH_TOK_INVALID; | 253 | global_auth_tok->flags &= ~ECRYPTFS_AUTH_TOK_INVALID; |
254 | } | 254 | } |
255 | out: | ||
255 | return rc; | 256 | return rc; |
256 | } | 257 | } |
257 | 258 | ||
@@ -416,7 +417,6 @@ static int ecryptfs_parse_options(struct super_block *sb, char *options) | |||
416 | printk(KERN_WARNING "One or more global auth toks could not " | 417 | printk(KERN_WARNING "One or more global auth toks could not " |
417 | "properly register; rc = [%d]\n", rc); | 418 | "properly register; rc = [%d]\n", rc); |
418 | } | 419 | } |
419 | rc = 0; | ||
420 | out: | 420 | out: |
421 | return rc; | 421 | return rc; |
422 | } | 422 | } |