diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-02-22 14:22:53 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-02-22 14:22:53 +1100 |
| commit | c02b5d5fabc96945ca2c0cb602113b6b54f38eba (patch) | |
| tree | c23aeb8fbf97ea4706baaa16ce2ddede30c51ac1 | |
| parent | 8588677b2a624f5f5a3bca3cd3413aded65ab4fa (diff) | |
| parent | 1cbc8947c4988413663d7cff13ce25699581e29c (diff) | |
Merge commit 'dlm/next'
| -rw-r--r-- | fs/dlm/config.c | 2 | ||||
| -rw-r--r-- | fs/dlm/lock.c | 5 | ||||
| -rw-r--r-- | fs/dlm/lock.h | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/fs/dlm/config.c b/fs/dlm/config.c index c3ad1dff3b25..7ceaea3d983b 100644 --- a/fs/dlm/config.c +++ b/fs/dlm/config.c @@ -114,7 +114,7 @@ struct cluster_attribute { }; static ssize_t cluster_set(struct cluster *cl, unsigned int *cl_field, - unsigned int *info_field, int check_zero, + int *info_field, int check_zero, const char *buf, size_t len) { unsigned int x; diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index 8f250ac8b928..2d3d1027ce2b 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c @@ -165,7 +165,7 @@ void dlm_print_lkb(struct dlm_lkb *lkb) lkb->lkb_grmode, lkb->lkb_wait_type, lkb->lkb_ast_type); } -void dlm_print_rsb(struct dlm_rsb *r) +static void dlm_print_rsb(struct dlm_rsb *r) { printk(KERN_ERR "rsb: nodeid %d flags %lx first %x rlc %d name %s\n", r->res_nodeid, r->res_flags, r->res_first_lkid, @@ -1956,8 +1956,7 @@ static void confirm_master(struct dlm_rsb *r, int error) list_del_init(&lkb->lkb_rsb_lookup); r->res_first_lkid = lkb->lkb_id; _request_lock(r, lkb); - } else - r->res_nodeid = -1; + } break; default: diff --git a/fs/dlm/lock.h b/fs/dlm/lock.h index 05d9c82e646b..88e93c80cc22 100644 --- a/fs/dlm/lock.h +++ b/fs/dlm/lock.h @@ -13,7 +13,6 @@ #ifndef __LOCK_DOT_H__ #define __LOCK_DOT_H__ -void dlm_print_rsb(struct dlm_rsb *r); void dlm_dump_rsb(struct dlm_rsb *r); void dlm_print_lkb(struct dlm_lkb *lkb); void dlm_receive_message_saved(struct dlm_ls *ls, struct dlm_message *ms); |