Browse Source

switch hpfs

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro 14 years ago
parent
commit
43d344d772
4 changed files with 3 additions and 9 deletions
  1. 1 6
      fs/hpfs/dentry.c
  2. 0 1
      fs/hpfs/dir.c
  3. 1 1
      fs/hpfs/hpfs_fn.h
  4. 1 1
      fs/hpfs/super.c

+ 1 - 6
fs/hpfs/dentry.c

@@ -58,12 +58,7 @@ static int hpfs_compare_dentry(const struct dentry *parent,
 	return 0;
 	return 0;
 }
 }
 
 
-static const struct dentry_operations hpfs_dentry_operations = {
+const struct dentry_operations hpfs_dentry_operations = {
 	.d_hash		= hpfs_hash_dentry,
 	.d_hash		= hpfs_hash_dentry,
 	.d_compare	= hpfs_compare_dentry,
 	.d_compare	= hpfs_compare_dentry,
 };
 };
-
-void hpfs_set_dentry_operations(struct dentry *dentry)
-{
-	d_set_d_op(dentry, &hpfs_dentry_operations);
-}

+ 0 - 1
fs/hpfs/dir.c

@@ -298,7 +298,6 @@ struct dentry *hpfs_lookup(struct inode *dir, struct dentry *dentry, struct name
 
 
 	end:
 	end:
 	end_add:
 	end_add:
-	hpfs_set_dentry_operations(dentry);
 	unlock_kernel();
 	unlock_kernel();
 	d_add(dentry, result);
 	d_add(dentry, result);
 	return NULL;
 	return NULL;

+ 1 - 1
fs/hpfs/hpfs_fn.h

@@ -233,7 +233,7 @@ void hpfs_mark_4buffers_dirty(struct quad_buffer_head *);
 
 
 /* dentry.c */
 /* dentry.c */
 
 
-void hpfs_set_dentry_operations(struct dentry *);
+extern const struct dentry_operations hpfs_dentry_operations;
 
 
 /* dir.c */
 /* dir.c */
 
 

+ 1 - 1
fs/hpfs/super.c

@@ -550,6 +550,7 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)
 	/* Fill superblock stuff */
 	/* Fill superblock stuff */
 	s->s_magic = HPFS_SUPER_MAGIC;
 	s->s_magic = HPFS_SUPER_MAGIC;
 	s->s_op = &hpfs_sops;
 	s->s_op = &hpfs_sops;
+	s->s_d_op = &hpfs_dentry_operations;
 
 
 	sbi->sb_root = superblock->root;
 	sbi->sb_root = superblock->root;
 	sbi->sb_fs_size = superblock->n_sectors;
 	sbi->sb_fs_size = superblock->n_sectors;
@@ -651,7 +652,6 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)
 		iput(root);
 		iput(root);
 		goto bail0;
 		goto bail0;
 	}
 	}
-	hpfs_set_dentry_operations(s->s_root);
 
 
 	/*
 	/*
 	 * find the root directory's . pointer & finish filling in the inode
 	 * find the root directory's . pointer & finish filling in the inode