diff options
Diffstat (limited to 'fs/dlm/user.c')
| -rw-r--r-- | fs/dlm/user.c | 10 | 
1 files changed, 6 insertions, 4 deletions
| diff --git a/fs/dlm/user.c b/fs/dlm/user.c index e73a4bb572aa..a4bfd31ac45b 100644 --- a/fs/dlm/user.c +++ b/fs/dlm/user.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* | 
| 2 | * Copyright (C) 2006-2009 Red Hat, Inc. All rights reserved. | 2 | * Copyright (C) 2006-2010 Red Hat, Inc. All rights reserved. | 
| 3 | * | 3 | * | 
| 4 | * This copyrighted material is made available to anyone wishing to use, | 4 | * This copyrighted material is made available to anyone wishing to use, | 
| 5 | * modify, copy, or redistribute it subject to the terms and conditions | 5 | * modify, copy, or redistribute it subject to the terms and conditions | 
| @@ -173,7 +173,7 @@ static int lkb_is_endoflife(struct dlm_lkb *lkb, int sb_status, int type) | |||
| 173 | /* we could possibly check if the cancel of an orphan has resulted in the lkb | 173 | /* we could possibly check if the cancel of an orphan has resulted in the lkb | 
| 174 | being removed and then remove that lkb from the orphans list and free it */ | 174 | being removed and then remove that lkb from the orphans list and free it */ | 
| 175 | 175 | ||
| 176 | void dlm_user_add_ast(struct dlm_lkb *lkb, int type, int bastmode) | 176 | void dlm_user_add_ast(struct dlm_lkb *lkb, int type, int mode) | 
| 177 | { | 177 | { | 
| 178 | struct dlm_ls *ls; | 178 | struct dlm_ls *ls; | 
| 179 | struct dlm_user_args *ua; | 179 | struct dlm_user_args *ua; | 
| @@ -206,8 +206,10 @@ void dlm_user_add_ast(struct dlm_lkb *lkb, int type, int bastmode) | |||
| 206 | 206 | ||
| 207 | ast_type = lkb->lkb_ast_type; | 207 | ast_type = lkb->lkb_ast_type; | 
| 208 | lkb->lkb_ast_type |= type; | 208 | lkb->lkb_ast_type |= type; | 
| 209 | if (bastmode) | 209 | if (type == AST_BAST) | 
| 210 | lkb->lkb_bastmode = bastmode; | 210 | lkb->lkb_bastmode = mode; | 
| 211 | else | ||
| 212 | lkb->lkb_castmode = mode; | ||
| 211 | 213 | ||
| 212 | if (!ast_type) { | 214 | if (!ast_type) { | 
| 213 | kref_get(&lkb->lkb_ref); | 215 | kref_get(&lkb->lkb_ref); | 
