diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /fs/ext3 | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'fs/ext3')
| -rw-r--r-- | fs/ext3/dir.c | 2 | ||||
| -rw-r--r-- | fs/ext3/file.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c index 38bd3f6ec147..f37528ed222e 100644 --- a/fs/ext3/dir.c +++ b/fs/ext3/dir.c | |||
| @@ -39,7 +39,7 @@ static int ext3_dx_readdir(struct file * filp, | |||
| 39 | static int ext3_release_dir (struct inode * inode, | 39 | static int ext3_release_dir (struct inode * inode, |
| 40 | struct file * filp); | 40 | struct file * filp); |
| 41 | 41 | ||
| 42 | struct file_operations ext3_dir_operations = { | 42 | const struct file_operations ext3_dir_operations = { |
| 43 | .llseek = generic_file_llseek, | 43 | .llseek = generic_file_llseek, |
| 44 | .read = generic_read_dir, | 44 | .read = generic_read_dir, |
| 45 | .readdir = ext3_readdir, /* we take BKL. needed?*/ | 45 | .readdir = ext3_readdir, /* we take BKL. needed?*/ |
diff --git a/fs/ext3/file.c b/fs/ext3/file.c index 59098ea56711..783a796220bb 100644 --- a/fs/ext3/file.c +++ b/fs/ext3/file.c | |||
| @@ -105,7 +105,7 @@ force_commit: | |||
| 105 | return ret; | 105 | return ret; |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | struct file_operations ext3_file_operations = { | 108 | const struct file_operations ext3_file_operations = { |
| 109 | .llseek = generic_file_llseek, | 109 | .llseek = generic_file_llseek, |
| 110 | .read = do_sync_read, | 110 | .read = do_sync_read, |
| 111 | .write = do_sync_write, | 111 | .write = do_sync_write, |