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/inode.c | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'fs/inode.c')
| -rw-r--r-- | fs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/inode.c b/fs/inode.c index 1fddf2803af8..32b7c3375021 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
| @@ -104,7 +104,7 @@ static struct inode *alloc_inode(struct super_block *sb) | |||
| 104 | { | 104 | { |
| 105 | static struct address_space_operations empty_aops; | 105 | static struct address_space_operations empty_aops; |
| 106 | static struct inode_operations empty_iops; | 106 | static struct inode_operations empty_iops; |
| 107 | static struct file_operations empty_fops; | 107 | static const struct file_operations empty_fops; |
| 108 | struct inode *inode; | 108 | struct inode *inode; |
| 109 | 109 | ||
| 110 | if (sb->s_op->alloc_inode) | 110 | if (sb->s_op->alloc_inode) |