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/isofs/inode.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/isofs/inode.c')
| -rw-r--r-- | fs/isofs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index ea55b6c469ec..64a96cdfe3a4 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c | |||
| @@ -106,7 +106,7 @@ static int isofs_remount(struct super_block *sb, int *flags, char *data) | |||
| 106 | return 0; | 106 | return 0; |
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | static struct super_operations isofs_sops = { | 109 | static const struct super_operations isofs_sops = { |
| 110 | .alloc_inode = isofs_alloc_inode, | 110 | .alloc_inode = isofs_alloc_inode, |
| 111 | .destroy_inode = isofs_destroy_inode, | 111 | .destroy_inode = isofs_destroy_inode, |
| 112 | .read_inode = isofs_read_inode, | 112 | .read_inode = isofs_read_inode, |