diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
| commit | d9bc125caf592b7d081021f32ce5b717efdf70c8 (patch) | |
| tree | 263b7066ba22ddce21db610c0300f6eaac6f2064 /fs/hfs/super.c | |
| parent | 43d78ef2ba5bec26d0315859e8324bfc0be23766 (diff) | |
| parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix conflicts.
Diffstat (limited to 'fs/hfs/super.c')
| -rw-r--r-- | fs/hfs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hfs/super.c b/fs/hfs/super.c index a36987966004..623f509f1d47 100644 --- a/fs/hfs/super.c +++ b/fs/hfs/super.c | |||
| @@ -154,7 +154,7 @@ static void hfs_destroy_inode(struct inode *inode) | |||
| 154 | kmem_cache_free(hfs_inode_cachep, HFS_I(inode)); | 154 | kmem_cache_free(hfs_inode_cachep, HFS_I(inode)); |
| 155 | } | 155 | } |
| 156 | 156 | ||
| 157 | static struct super_operations hfs_super_operations = { | 157 | static const struct super_operations hfs_super_operations = { |
| 158 | .alloc_inode = hfs_alloc_inode, | 158 | .alloc_inode = hfs_alloc_inode, |
| 159 | .destroy_inode = hfs_destroy_inode, | 159 | .destroy_inode = hfs_destroy_inode, |
| 160 | .write_inode = hfs_write_inode, | 160 | .write_inode = hfs_write_inode, |