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/ocfs2/symlink.h | |
| 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/ocfs2/symlink.h')
| -rw-r--r-- | fs/ocfs2/symlink.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/symlink.h b/fs/ocfs2/symlink.h index 1ea9e4d9e9eb..65a6c9c6ad51 100644 --- a/fs/ocfs2/symlink.h +++ b/fs/ocfs2/symlink.h | |||
| @@ -26,8 +26,8 @@ | |||
| 26 | #ifndef OCFS2_SYMLINK_H | 26 | #ifndef OCFS2_SYMLINK_H |
| 27 | #define OCFS2_SYMLINK_H | 27 | #define OCFS2_SYMLINK_H |
| 28 | 28 | ||
| 29 | extern struct inode_operations ocfs2_symlink_inode_operations; | 29 | extern const struct inode_operations ocfs2_symlink_inode_operations; |
| 30 | extern struct inode_operations ocfs2_fast_symlink_inode_operations; | 30 | extern const struct inode_operations ocfs2_fast_symlink_inode_operations; |
| 31 | 31 | ||
| 32 | /* | 32 | /* |
| 33 | * Test whether an inode is a fast symlink. | 33 | * Test whether an inode is a fast symlink. |