X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2Fcoda%2Finode.c;h=0aaff3651d146a32ade9cd540abbc9e69a263d68;hb=5b982c5bb7db5cfbc15236d9d45cec32e5472ed5;hp=b64659fa82d0e6c94ffcf93d81a2cfb1fd70686a;hpb=e18b890bb0881bbab6f4f1a6cd20d9c60d66b003;p=powerpc.git

diff --git a/fs/coda/inode.c b/fs/coda/inode.c
index b64659fa82..0aaff3651d 100644
--- a/fs/coda/inode.c
+++ b/fs/coda/inode.c
@@ -62,8 +62,7 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
 {
 	struct coda_inode_info *ei = (struct coda_inode_info *) foo;
 
-	if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
-	    SLAB_CTOR_CONSTRUCTOR)
+	if (flags & SLAB_CTOR_CONSTRUCTOR)
 		inode_init_once(&ei->vfs_inode);
 }
  
@@ -90,7 +89,7 @@ static int coda_remount(struct super_block *sb, int *flags, char *data)
 }
 
 /* exported operations */
-static struct super_operations coda_super_operations =
+static const struct super_operations coda_super_operations =
 {
 	.alloc_inode	= coda_alloc_inode,
 	.destroy_inode	= coda_destroy_inode,
@@ -119,7 +118,7 @@ static int get_device_index(struct coda_mount_data *data)
 	file = fget(data->fd);
 	inode = NULL;
 	if(file)
-		inode = file->f_dentry->d_inode;
+		inode = file->f_path.dentry->d_inode;
 	
 	if(!inode || !S_ISCHR(inode->i_mode) ||
 	   imajor(inode) != CODA_PSDEV_MAJOR) {
@@ -271,7 +270,7 @@ int coda_setattr(struct dentry *de, struct iattr *iattr)
 	return error;
 }
 
-struct inode_operations coda_file_inode_operations = {
+const struct inode_operations coda_file_inode_operations = {
 	.permission	= coda_permission,
 	.getattr	= coda_getattr,
 	.setattr	= coda_setattr,