diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/gfs2/lm_interface.h | 1 | ||||
-rw-r--r-- | fs/gfs2/locking/dlm/lock.c | 17 | ||||
-rw-r--r-- | fs/gfs2/locking/dlm/lock_dlm.h | 1 | ||||
-rw-r--r-- | fs/gfs2/locking/dlm/mount.c | 1 | ||||
-rw-r--r-- | fs/gfs2/locking/nolock/main.c | 12 |
5 files changed, 0 insertions, 32 deletions
diff --git a/fs/gfs2/lm_interface.h b/fs/gfs2/lm_interface.h index 75835e0f4254..148136a34625 100644 --- a/fs/gfs2/lm_interface.h +++ b/fs/gfs2/lm_interface.h | |||
@@ -211,7 +211,6 @@ struct lm_lockops { | |||
211 | 211 | ||
212 | int (*lm_hold_lvb) (lm_lock_t *lock, char **lvbp); | 212 | int (*lm_hold_lvb) (lm_lock_t *lock, char **lvbp); |
213 | void (*lm_unhold_lvb) (lm_lock_t *lock, char *lvb); | 213 | void (*lm_unhold_lvb) (lm_lock_t *lock, char *lvb); |
214 | void (*lm_sync_lvb) (lm_lock_t *lock, char *lvb); | ||
215 | 214 | ||
216 | /* | 215 | /* |
217 | * Posix Lock oriented operations | 216 | * Posix Lock oriented operations |
diff --git a/fs/gfs2/locking/dlm/lock.c b/fs/gfs2/locking/dlm/lock.c index dceea419b94b..e4359b1b7174 100644 --- a/fs/gfs2/locking/dlm/lock.c +++ b/fs/gfs2/locking/dlm/lock.c | |||
@@ -490,23 +490,6 @@ void gdlm_unhold_lvb(lm_lock_t *lock, char *lvb) | |||
490 | gdlm_del_lvb(lp); | 490 | gdlm_del_lvb(lp); |
491 | } | 491 | } |
492 | 492 | ||
493 | void gdlm_sync_lvb(lm_lock_t *lock, char *lvb) | ||
494 | { | ||
495 | struct gdlm_lock *lp = (struct gdlm_lock *) lock; | ||
496 | |||
497 | if (lp->cur != DLM_LOCK_EX) | ||
498 | return; | ||
499 | |||
500 | init_completion(&lp->ast_wait); | ||
501 | set_bit(LFL_SYNC_LVB, &lp->flags); | ||
502 | |||
503 | lp->req = DLM_LOCK_EX; | ||
504 | lp->lkf = make_flags(lp, 0, lp->cur, lp->req); | ||
505 | |||
506 | gdlm_do_lock(lp); | ||
507 | wait_for_completion(&lp->ast_wait); | ||
508 | } | ||
509 | |||
510 | void gdlm_submit_delayed(struct gdlm_ls *ls) | 493 | void gdlm_submit_delayed(struct gdlm_ls *ls) |
511 | { | 494 | { |
512 | struct gdlm_lock *lp, *safe; | 495 | struct gdlm_lock *lp, *safe; |
diff --git a/fs/gfs2/locking/dlm/lock_dlm.h b/fs/gfs2/locking/dlm/lock_dlm.h index e6898d236521..a4f534a0ecff 100644 --- a/fs/gfs2/locking/dlm/lock_dlm.h +++ b/fs/gfs2/locking/dlm/lock_dlm.h | |||
@@ -172,7 +172,6 @@ unsigned int gdlm_unlock(lm_lock_t *, unsigned int); | |||
172 | void gdlm_cancel(lm_lock_t *); | 172 | void gdlm_cancel(lm_lock_t *); |
173 | int gdlm_hold_lvb(lm_lock_t *, char **); | 173 | int gdlm_hold_lvb(lm_lock_t *, char **); |
174 | void gdlm_unhold_lvb(lm_lock_t *, char *); | 174 | void gdlm_unhold_lvb(lm_lock_t *, char *); |
175 | void gdlm_sync_lvb(lm_lock_t *, char *); | ||
176 | 175 | ||
177 | /* plock.c */ | 176 | /* plock.c */ |
178 | 177 | ||
diff --git a/fs/gfs2/locking/dlm/mount.c b/fs/gfs2/locking/dlm/mount.c index 8a1764f4d71c..832fb819a2b5 100644 --- a/fs/gfs2/locking/dlm/mount.c +++ b/fs/gfs2/locking/dlm/mount.c | |||
@@ -249,7 +249,6 @@ struct lm_lockops gdlm_ops = { | |||
249 | .lm_cancel = gdlm_cancel, | 249 | .lm_cancel = gdlm_cancel, |
250 | .lm_hold_lvb = gdlm_hold_lvb, | 250 | .lm_hold_lvb = gdlm_hold_lvb, |
251 | .lm_unhold_lvb = gdlm_unhold_lvb, | 251 | .lm_unhold_lvb = gdlm_unhold_lvb, |
252 | .lm_sync_lvb = gdlm_sync_lvb, | ||
253 | .lm_recovery_done = gdlm_recovery_done, | 252 | .lm_recovery_done = gdlm_recovery_done, |
254 | .lm_owner = THIS_MODULE, | 253 | .lm_owner = THIS_MODULE, |
255 | }; | 254 | }; |
diff --git a/fs/gfs2/locking/nolock/main.c b/fs/gfs2/locking/nolock/main.c index e326079430a2..ba7399787f62 100644 --- a/fs/gfs2/locking/nolock/main.c +++ b/fs/gfs2/locking/nolock/main.c | |||
@@ -162,17 +162,6 @@ static void nolock_unhold_lvb(lm_lock_t *lock, char *lvb) | |||
162 | kfree(lvb); | 162 | kfree(lvb); |
163 | } | 163 | } |
164 | 164 | ||
165 | /** | ||
166 | * nolock_sync_lvb - sync out the value of a lvb | ||
167 | * @lock: the lock the LVB is associated with | ||
168 | * @lvb: the lock value block | ||
169 | * | ||
170 | */ | ||
171 | |||
172 | static void nolock_sync_lvb(lm_lock_t *lock, char *lvb) | ||
173 | { | ||
174 | } | ||
175 | |||
176 | static int nolock_plock_get(lm_lockspace_t *lockspace, struct lm_lockname *name, | 165 | static int nolock_plock_get(lm_lockspace_t *lockspace, struct lm_lockname *name, |
177 | struct file *file, struct file_lock *fl) | 166 | struct file *file, struct file_lock *fl) |
178 | { | 167 | { |
@@ -221,7 +210,6 @@ static struct lm_lockops nolock_ops = { | |||
221 | .lm_cancel = nolock_cancel, | 210 | .lm_cancel = nolock_cancel, |
222 | .lm_hold_lvb = nolock_hold_lvb, | 211 | .lm_hold_lvb = nolock_hold_lvb, |
223 | .lm_unhold_lvb = nolock_unhold_lvb, | 212 | .lm_unhold_lvb = nolock_unhold_lvb, |
224 | .lm_sync_lvb = nolock_sync_lvb, | ||
225 | .lm_plock_get = nolock_plock_get, | 213 | .lm_plock_get = nolock_plock_get, |
226 | .lm_plock = nolock_plock, | 214 | .lm_plock = nolock_plock, |
227 | .lm_punlock = nolock_punlock, | 215 | .lm_punlock = nolock_punlock, |