diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 17:19:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 17:19:30 -0800 |
| commit | 4cbd55188fe01f22783815cbb6d4f55a0ebf5969 (patch) | |
| tree | cbefb228c717bc53542452b44d5349c3665845ee /fs/dlm/ast.h | |
| parent | b305956abc3c50c52598bbf39b7a5f4850058ba8 (diff) | |
| parent | b6fa8796b2da0390e9f4115e8789a01004fc1c9b (diff) | |
| download | linux-stable-4cbd55188fe01f22783815cbb6d4f55a0ebf5969.tar.gz linux-stable-4cbd55188fe01f22783815cbb6d4f55a0ebf5969.tar.bz2 linux-stable-4cbd55188fe01f22783815cbb6d4f55a0ebf5969.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
dlm: use bastmode in debugfs output
dlm: Send lockspace name with uevents
dlm: send reply before bast
dlm: fix ordering of bast and cast
Diffstat (limited to 'fs/dlm/ast.h')
| -rw-r--r-- | fs/dlm/ast.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/dlm/ast.h b/fs/dlm/ast.h index 1b5fc5f428fd..bcb1aaba519d 100644 --- a/fs/dlm/ast.h +++ b/fs/dlm/ast.h @@ -1,7 +1,7 @@ /****************************************************************************** ******************************************************************************* ** -** Copyright (C) 2005-2008 Red Hat, Inc. All rights reserved. +** Copyright (C) 2005-2010 Red Hat, Inc. All rights reserved. ** ** This copyrighted material is made available to anyone wishing to use, ** modify, copy, or redistribute it subject to the terms and conditions @@ -13,7 +13,7 @@ #ifndef __ASTD_DOT_H__ #define __ASTD_DOT_H__ -void dlm_add_ast(struct dlm_lkb *lkb, int type, int bastmode); +void dlm_add_ast(struct dlm_lkb *lkb, int type, int mode); void dlm_del_ast(struct dlm_lkb *lkb); void dlm_astd_wake(void); |