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/ext2/namei.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/ext2/namei.c')
| -rw-r--r-- | fs/ext2/namei.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c index e1af5b4cf80c..e69beed839ac 100644 --- a/fs/ext2/namei.c +++ b/fs/ext2/namei.c | |||
| @@ -373,7 +373,7 @@ out: | |||
| 373 | return err; | 373 | return err; |
| 374 | } | 374 | } |
| 375 | 375 | ||
| 376 | struct inode_operations ext2_dir_inode_operations = { | 376 | const struct inode_operations ext2_dir_inode_operations = { |
| 377 | .create = ext2_create, | 377 | .create = ext2_create, |
| 378 | .lookup = ext2_lookup, | 378 | .lookup = ext2_lookup, |
| 379 | .link = ext2_link, | 379 | .link = ext2_link, |
| @@ -393,7 +393,7 @@ struct inode_operations ext2_dir_inode_operations = { | |||
| 393 | .permission = ext2_permission, | 393 | .permission = ext2_permission, |
| 394 | }; | 394 | }; |
| 395 | 395 | ||
| 396 | struct inode_operations ext2_special_inode_operations = { | 396 | const struct inode_operations ext2_special_inode_operations = { |
| 397 | #ifdef CONFIG_EXT2_FS_XATTR | 397 | #ifdef CONFIG_EXT2_FS_XATTR |
| 398 | .setxattr = generic_setxattr, | 398 | .setxattr = generic_setxattr, |
| 399 | .getxattr = generic_getxattr, | 399 | .getxattr = generic_getxattr, |