diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2006-03-28 20:24:39 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2006-03-28 20:24:39 -0500 |
| commit | c0e4077c946104e5d8a62f835dcdca5c79c8af7d (patch) | |
| tree | c1f458722f86690a6172bbac2dfef3241ba0ec7e /fs/inode.c | |
| parent | 94c2d01a537daf51a9fcf229d7d2204c979355d9 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge with git+ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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) |