diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-31 09:29:31 +1100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-31 09:29:31 +1100 |
| commit | f389e9fcecdec4c4cb890ad28ea30a87a579ec3e (patch) | |
| tree | a26a94886ca384da320bb972fed56fcaf7722512 /fs/dlm/member.h | |
| parent | 2419505acc479d2f1feed94d195b0554a64269a4 (diff) | |
| parent | 0fe410d3f3b1496190f37ef74cd089229cef97fa (diff) | |
| download | op-kernel-dev-f389e9fcecdec4c4cb890ad28ea30a87a579ec3e.zip op-kernel-dev-f389e9fcecdec4c4cb890ad28ea30a87a579ec3e.tar.gz | |
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: (21 commits)
dlm: static initialization improvements
dlm: clean ups
dlm: Sanity check namelen before copying it
dlm: keep cached master rsbs during recovery
dlm: change error message to debug
dlm: fix possible use-after-free
dlm: limit dir lookup loop
dlm: reject normal unlock when lock is waiting for lookup
dlm: validate messages before processing
dlm: reject messages from non-members
dlm: another call to confirm_master in receive_request_reply
dlm: recover locks waiting for overlap replies
dlm: clear ast_type when removing from astqueue
dlm: use fixed errno values in messages
dlm: swap bytes for rcom lock reply
dlm: align midcomms message buffer
dlm: close othercons
dlm: use dlm prefix on alloc and free functions
dlm: don't print common non-errors
dlm: proper prototypes
...
Diffstat (limited to 'fs/dlm/member.h')
| -rw-r--r-- | fs/dlm/member.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/dlm/member.h b/fs/dlm/member.h index 927c08c..7a26fca 100644 --- a/fs/dlm/member.h +++ b/fs/dlm/member.h @@ -1,7 +1,7 @@ /****************************************************************************** ******************************************************************************* ** -** Copyright (C) 2005 Red Hat, Inc. All rights reserved. +** Copyright (C) 2005-2008 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 @@ -19,6 +19,7 @@ void dlm_clear_members(struct dlm_ls *ls); void dlm_clear_members_gone(struct dlm_ls *ls); int dlm_recover_members(struct dlm_ls *ls, struct dlm_recover *rv,int *neg_out); int dlm_is_removed(struct dlm_ls *ls, int nodeid); +int dlm_is_member(struct dlm_ls *ls, int nodeid); #endif /* __MEMBER_DOT_H__ */ |
