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/cramfs/inode.c | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'fs/cramfs/inode.c')
| -rw-r--r-- | fs/cramfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c index acc1b2c10a86..9efcc3a164e8 100644 --- a/fs/cramfs/inode.c +++ b/fs/cramfs/inode.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | static struct super_operations cramfs_ops; | 30 | static struct super_operations cramfs_ops; |
| 31 | static struct inode_operations cramfs_dir_inode_operations; | 31 | static struct inode_operations cramfs_dir_inode_operations; |
| 32 | static struct file_operations cramfs_directory_operations; | 32 | static const struct file_operations cramfs_directory_operations; |
| 33 | static struct address_space_operations cramfs_aops; | 33 | static struct address_space_operations cramfs_aops; |
| 34 | 34 | ||
| 35 | static DEFINE_MUTEX(read_mutex); | 35 | static DEFINE_MUTEX(read_mutex); |
| @@ -512,7 +512,7 @@ static struct address_space_operations cramfs_aops = { | |||
| 512 | /* | 512 | /* |
| 513 | * A directory can only readdir | 513 | * A directory can only readdir |
| 514 | */ | 514 | */ |
| 515 | static struct file_operations cramfs_directory_operations = { | 515 | static const struct file_operations cramfs_directory_operations = { |
| 516 | .llseek = generic_file_llseek, | 516 | .llseek = generic_file_llseek, |
| 517 | .read = generic_read_dir, | 517 | .read = generic_read_dir, |
| 518 | .readdir = cramfs_readdir, | 518 | .readdir = cramfs_readdir, |