fat: Fix _fat_bmap() race

[linux-2.6-omap-h63xx.git] / fs / dlm / rcom.c

diff --git a/fs/dlm/rcom.c b/fs/dlm/rcom.c
index ef9d0f9184925348660ef6b5ea9bb4a38dbd7b0b..67522c268c14972d20fb9825de128ff66aa2b2a9 100644 (file)
--- a/fs/dlm/rcom.c
+++ b/fs/dlm/rcom.c
@@ -215,6 +215,8 @@ int dlm_rcom_names(struct dlm_ls *ls, int nodeid, char *last_name, int last_len)
        ls->ls_recover_nodeid = nodeid;
 
        if (nodeid == dlm_our_nodeid()) {
+               ls->ls_recover_buf->rc_header.h_length =
+                       dlm_config.ci_buffer_size;
                dlm_copy_master_names(ls, last_name, last_len,
                                      ls->ls_recover_buf->rc_buf,
                                      max_size, nodeid);
@@ -318,9 +320,9 @@ static void pack_rcom_lock(struct dlm_rsb *r, struct dlm_lkb *lkb,
        rl->rl_status = lkb->lkb_status;
        rl->rl_wait_type = cpu_to_le16(lkb->lkb_wait_type);
 
-       if (lkb->lkb_bastaddr)
+       if (lkb->lkb_bastfn)
                rl->rl_asts |= AST_BAST;
-       if (lkb->lkb_astaddr)
+       if (lkb->lkb_astfn)
                rl->rl_asts |= AST_COMP;
 
        rl->rl_namelen = cpu_to_le16(r->res_length);