aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2006-01-18 04:34:14 -0500
committerSteven Whitehouse <swhiteho@redhat.com>2006-01-18 04:34:14 -0500
commit5ddec5b3d79eed6df1a37be435f183915a4b696a (patch)
tree5e3067dd2978c2035b43ee93660bb8d6ca3e8fb1 /fs
parente7fd41792fc0ee52a05fcaac87511f118328d147 (diff)
[GFS2] Only two args for kobject_uevent() in locking/dlm/mount.c
Update the dlm interface module to take account of the recently removed third argument to kobject_uevent() Signed-off-by: David Teigland <teigland@redhat.com> Signed-off-by: Steve Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/locking/dlm/mount.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/locking/dlm/mount.c b/fs/gfs2/locking/dlm/mount.c
index bfb224638f2d..042f3a75c441 100644
--- a/fs/gfs2/locking/dlm/mount.c
+++ b/fs/gfs2/locking/dlm/mount.c
@@ -195,14 +195,14 @@ static void gdlm_recovery_done(lm_lockspace_t *lockspace, unsigned int jid,
195{ 195{
196 struct gdlm_ls *ls = (struct gdlm_ls *) lockspace; 196 struct gdlm_ls *ls = (struct gdlm_ls *) lockspace;
197 ls->recover_jid_done = jid; 197 ls->recover_jid_done = jid;
198 kobject_uevent(&ls->kobj, KOBJ_CHANGE, NULL); 198 kobject_uevent(&ls->kobj, KOBJ_CHANGE);
199} 199}
200 200
201static void gdlm_others_may_mount(lm_lockspace_t *lockspace) 201static void gdlm_others_may_mount(lm_lockspace_t *lockspace)
202{ 202{
203 struct gdlm_ls *ls = (struct gdlm_ls *) lockspace; 203 struct gdlm_ls *ls = (struct gdlm_ls *) lockspace;
204 ls->first_done = 1; 204 ls->first_done = 1;
205 kobject_uevent(&ls->kobj, KOBJ_CHANGE, NULL); 205 kobject_uevent(&ls->kobj, KOBJ_CHANGE);
206} 206}
207 207
208/* Userspace gets the offline uevent, blocks new gfs locks on 208/* Userspace gets the offline uevent, blocks new gfs locks on
@@ -213,7 +213,7 @@ static void gdlm_withdraw(lm_lockspace_t *lockspace)
213{ 213{
214 struct gdlm_ls *ls = (struct gdlm_ls *) lockspace; 214 struct gdlm_ls *ls = (struct gdlm_ls *) lockspace;
215 215
216 kobject_uevent(&ls->kobj, KOBJ_OFFLINE, NULL); 216 kobject_uevent(&ls->kobj, KOBJ_OFFLINE);
217 217
218 wait_event_interruptible(ls->wait_control, 218 wait_event_interruptible(ls->wait_control,
219 test_bit(DFL_WITHDRAW, &ls->flags)); 219 test_bit(DFL_WITHDRAW, &ls->flags));