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/hfsplus | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'fs/hfsplus')
| -rw-r--r-- | fs/hfsplus/dir.c | 2 | ||||
| -rw-r--r-- | fs/hfsplus/inode.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c index 01a6fe3a395c..1f9ece0de326 100644 --- a/fs/hfsplus/dir.c +++ b/fs/hfsplus/dir.c | |||
| @@ -483,7 +483,7 @@ struct inode_operations hfsplus_dir_inode_operations = { | |||
| 483 | .rename = hfsplus_rename, | 483 | .rename = hfsplus_rename, |
| 484 | }; | 484 | }; |
| 485 | 485 | ||
| 486 | struct file_operations hfsplus_dir_operations = { | 486 | const struct file_operations hfsplus_dir_operations = { |
| 487 | .read = generic_read_dir, | 487 | .read = generic_read_dir, |
| 488 | .readdir = hfsplus_readdir, | 488 | .readdir = hfsplus_readdir, |
| 489 | .ioctl = hfsplus_ioctl, | 489 | .ioctl = hfsplus_ioctl, |
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c index 9fbe4d2aeece..acf66dba3e01 100644 --- a/fs/hfsplus/inode.c +++ b/fs/hfsplus/inode.c | |||
| @@ -280,7 +280,7 @@ static struct inode_operations hfsplus_file_inode_operations = { | |||
| 280 | .listxattr = hfsplus_listxattr, | 280 | .listxattr = hfsplus_listxattr, |
| 281 | }; | 281 | }; |
| 282 | 282 | ||
| 283 | static struct file_operations hfsplus_file_operations = { | 283 | static const struct file_operations hfsplus_file_operations = { |
| 284 | .llseek = generic_file_llseek, | 284 | .llseek = generic_file_llseek, |
| 285 | .read = generic_file_read, | 285 | .read = generic_file_read, |
| 286 | .write = generic_file_write, | 286 | .write = generic_file_write, |