diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-13 03:31:28 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-13 03:31:34 -0400 |
| commit | 9dbdd6c41c12fb42ee7188eafa7e1917b192af3a (patch) | |
| tree | 06a9eb894bc976c5c20e84ccd74fd82b9b71aed4 /fs/ocfs2/cluster/netdebug.c | |
| parent | 7a693d3f0d10f978ebdf3082c41404ab97106567 (diff) | |
| parent | 161291396e76e0832c08f617eb9bd364d1648148 (diff) | |
Merge commit 'v2.6.32-rc4' into perf/core
Merge reason: we were on an -rc1 base, merge up to -rc4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/ocfs2/cluster/netdebug.c')
| -rw-r--r-- | fs/ocfs2/cluster/netdebug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/cluster/netdebug.c b/fs/ocfs2/cluster/netdebug.c index cfb2be708abe..da794bc07a6c 100644 --- a/fs/ocfs2/cluster/netdebug.c +++ b/fs/ocfs2/cluster/netdebug.c | |||
| @@ -207,7 +207,7 @@ static int nst_fop_release(struct inode *inode, struct file *file) | |||
| 207 | return seq_release_private(inode, file); | 207 | return seq_release_private(inode, file); |
| 208 | } | 208 | } |
| 209 | 209 | ||
| 210 | static struct file_operations nst_seq_fops = { | 210 | static const struct file_operations nst_seq_fops = { |
| 211 | .open = nst_fop_open, | 211 | .open = nst_fop_open, |
| 212 | .read = seq_read, | 212 | .read = seq_read, |
| 213 | .llseek = seq_lseek, | 213 | .llseek = seq_lseek, |
| @@ -388,7 +388,7 @@ static int sc_fop_release(struct inode *inode, struct file *file) | |||
| 388 | return seq_release_private(inode, file); | 388 | return seq_release_private(inode, file); |
| 389 | } | 389 | } |
| 390 | 390 | ||
| 391 | static struct file_operations sc_seq_fops = { | 391 | static const struct file_operations sc_seq_fops = { |
| 392 | .open = sc_fop_open, | 392 | .open = sc_fop_open, |
| 393 | .read = seq_read, | 393 | .read = seq_read, |
| 394 | .llseek = seq_lseek, | 394 | .llseek = seq_lseek, |