aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/locking
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-09-04 12:04:26 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-09-04 12:04:26 -0400
commita91ea69ffd3f8a0b7139bfd44042ab384461e631 (patch)
treef05952e49e01609b21dbe8d27d9ffd30b4aa507f /fs/gfs2/locking
parent75d3b817a0b48425da921052955cc58f20bbab52 (diff)
[GFS2] Align all labels against LH side
This makes everything consistent. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/locking')
-rw-r--r--fs/gfs2/locking/dlm/lock.c2
-rw-r--r--fs/gfs2/locking/dlm/mount.c10
-rw-r--r--fs/gfs2/locking/dlm/thread.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/fs/gfs2/locking/dlm/lock.c b/fs/gfs2/locking/dlm/lock.c
index 2d81d90db097..1f15b6e8b2cf 100644
--- a/fs/gfs2/locking/dlm/lock.c
+++ b/fs/gfs2/locking/dlm/lock.c
@@ -437,7 +437,7 @@ static int hold_null_lock(struct gdlm_lock *lp)
437 gdlm_delete_lp(lpn); 437 gdlm_delete_lp(lpn);
438 lpn = NULL; 438 lpn = NULL;
439 } 439 }
440 out: 440out:
441 lp->hold_null = lpn; 441 lp->hold_null = lpn;
442 return error; 442 return error;
443} 443}
diff --git a/fs/gfs2/locking/dlm/mount.c b/fs/gfs2/locking/dlm/mount.c
index f279385774b7..82ac00af84a3 100644
--- a/fs/gfs2/locking/dlm/mount.c
+++ b/fs/gfs2/locking/dlm/mount.c
@@ -164,13 +164,13 @@ static int gdlm_mount(char *table_name, char *host_data,
164 lockstruct->ls_lvb_size = GDLM_LVB_SIZE; 164 lockstruct->ls_lvb_size = GDLM_LVB_SIZE;
165 return 0; 165 return 0;
166 166
167 out_kobj: 167out_kobj:
168 gdlm_kobject_release(ls); 168 gdlm_kobject_release(ls);
169 out_thread: 169out_thread:
170 gdlm_release_threads(ls); 170 gdlm_release_threads(ls);
171 out_free: 171out_free:
172 kfree(ls); 172 kfree(ls);
173 out: 173out:
174 return error; 174 return error;
175} 175}
176 176
@@ -194,7 +194,7 @@ static void gdlm_unmount(lm_lockspace_t *lockspace)
194 rv = gdlm_release_all_locks(ls); 194 rv = gdlm_release_all_locks(ls);
195 if (rv) 195 if (rv)
196 log_info("gdlm_unmount: %d stray locks freed", rv); 196 log_info("gdlm_unmount: %d stray locks freed", rv);
197 out: 197out:
198 kfree(ls); 198 kfree(ls);
199} 199}
200 200
diff --git a/fs/gfs2/locking/dlm/thread.c b/fs/gfs2/locking/dlm/thread.c
index 0b4be102e170..a782246d666b 100644
--- a/fs/gfs2/locking/dlm/thread.c
+++ b/fs/gfs2/locking/dlm/thread.c
@@ -206,7 +206,7 @@ static void process_complete(struct gdlm_lock *lp)
206 if (lp->lksb.sb_flags & DLM_SBF_DEMOTED) 206 if (lp->lksb.sb_flags & DLM_SBF_DEMOTED)
207 set_bit(LFL_NOCACHE, &lp->flags); 207 set_bit(LFL_NOCACHE, &lp->flags);
208 208
209 out: 209out:
210 /* 210 /*
211 * This is an internal lock_dlm lock 211 * This is an internal lock_dlm lock
212 */ 212 */