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/nfs/nfs4proc.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/nfs/nfs4proc.c')
-rw-r--r-- | fs/nfs/nfs4proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 1712d0360ee6..f52cf5c33c6c 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -3584,7 +3584,7 @@ struct nfs4_state_recovery_ops nfs4_network_partition_recovery_ops = { | |||
3584 | .recover_lock = nfs4_lock_expired, | 3584 | .recover_lock = nfs4_lock_expired, |
3585 | }; | 3585 | }; |
3586 | 3586 | ||
3587 | static struct inode_operations nfs4_file_inode_operations = { | 3587 | static const struct inode_operations nfs4_file_inode_operations = { |
3588 | .permission = nfs_permission, | 3588 | .permission = nfs_permission, |
3589 | .getattr = nfs_getattr, | 3589 | .getattr = nfs_getattr, |
3590 | .setattr = nfs_setattr, | 3590 | .setattr = nfs_setattr, |