diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-11 15:15:41 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-11 15:15:41 -0400 |
| commit | 5b4d4771e2a56671c7f1c94edda427a1e3d6f111 (patch) | |
| tree | 58718288a28cca121a94b681a7865473a10dfd64 /fs/ocfs2/dlmglue.c | |
| parent | 55f78e1771f0886162edd441dd4f39c287779de2 (diff) | |
| parent | baadac8b10c5ac15ce3d26b68fa266c8889b163f (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/ocfs2/dlmglue.c')
| -rw-r--r-- | fs/ocfs2/dlmglue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index f7794306b2bd..1f1873bf41fb 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c | |||
| @@ -2409,7 +2409,7 @@ static int ocfs2_dlm_seq_show(struct seq_file *m, void *v) | |||
| 2409 | return 0; | 2409 | return 0; |
| 2410 | } | 2410 | } |
| 2411 | 2411 | ||
| 2412 | static struct seq_operations ocfs2_dlm_seq_ops = { | 2412 | static const struct seq_operations ocfs2_dlm_seq_ops = { |
| 2413 | .start = ocfs2_dlm_seq_start, | 2413 | .start = ocfs2_dlm_seq_start, |
| 2414 | .stop = ocfs2_dlm_seq_stop, | 2414 | .stop = ocfs2_dlm_seq_stop, |
| 2415 | .next = ocfs2_dlm_seq_next, | 2415 | .next = ocfs2_dlm_seq_next, |