diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /fs/gfs2/glock.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'fs/gfs2/glock.c')
| -rw-r--r-- | fs/gfs2/glock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index e2431313491f..f07643e21bfa 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c | |||
| @@ -1123,7 +1123,7 @@ void gfs2_glock_dq_uninit(struct gfs2_holder *gh) | |||
| 1123 | * @number: the lock number | 1123 | * @number: the lock number |
| 1124 | * @glops: the glock operations for the type of glock | 1124 | * @glops: the glock operations for the type of glock |
| 1125 | * @state: the state to acquire the glock in | 1125 | * @state: the state to acquire the glock in |
| 1126 | * @flags: modifier flags for the aquisition | 1126 | * @flags: modifier flags for the acquisition |
| 1127 | * @gh: the struct gfs2_holder | 1127 | * @gh: the struct gfs2_holder |
| 1128 | * | 1128 | * |
| 1129 | * Returns: errno | 1129 | * Returns: errno |