diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-13 03:24:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-13 03:24:59 -0400 |
| commit | 2c96c142e941041973faab20ca3b82d57f435c5e (patch) | |
| tree | 45188f0ecb3f4bb7408a7219f8fcd041d500235a /fs/ocfs2/cluster/netdebug.c | |
| parent | 3c355863fb32070a2800f41106519c5c3038623a (diff) | |
| parent | 8ad807318fcd62aba0e18c7c7fbfcc1af3fcdbab (diff) | |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up tracing/filters fix from the urgent queue,
we will queue up dependent patches.
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, |