diff --git a/[refs] b/[refs] index a7bd7ccf9fb8..82563d2f7b76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7fd41792fc0ee52a05fcaac87511f118328d147 +refs/heads/master: 5ddec5b3d79eed6df1a37be435f183915a4b696a diff --git a/trunk/fs/gfs2/locking/dlm/mount.c b/trunk/fs/gfs2/locking/dlm/mount.c index bfb224638f2d..042f3a75c441 100644 --- a/trunk/fs/gfs2/locking/dlm/mount.c +++ b/trunk/fs/gfs2/locking/dlm/mount.c @@ -195,14 +195,14 @@ static void gdlm_recovery_done(lm_lockspace_t *lockspace, unsigned int jid, { struct gdlm_ls *ls = (struct gdlm_ls *) lockspace; ls->recover_jid_done = jid; - kobject_uevent(&ls->kobj, KOBJ_CHANGE, NULL); + kobject_uevent(&ls->kobj, KOBJ_CHANGE); } static void gdlm_others_may_mount(lm_lockspace_t *lockspace) { struct gdlm_ls *ls = (struct gdlm_ls *) lockspace; ls->first_done = 1; - kobject_uevent(&ls->kobj, KOBJ_CHANGE, NULL); + kobject_uevent(&ls->kobj, KOBJ_CHANGE); } /* Userspace gets the offline uevent, blocks new gfs locks on @@ -213,7 +213,7 @@ static void gdlm_withdraw(lm_lockspace_t *lockspace) { struct gdlm_ls *ls = (struct gdlm_ls *) lockspace; - kobject_uevent(&ls->kobj, KOBJ_OFFLINE, NULL); + kobject_uevent(&ls->kobj, KOBJ_OFFLINE); wait_event_interruptible(ls->wait_control, test_bit(DFL_WITHDRAW, &ls->flags));