ソースを参照

switch nfs to ->s_d_op

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro 14 年 前
コミット
8b244ff2fa
3 ファイル変更1 行追加10 行削除
  1. 0 4
      fs/nfs/dir.c
  2. 0 6
      fs/nfs/getroot.c
  3. 1 0
      fs/nfs/super.c

+ 0 - 4
fs/nfs/dir.c

@@ -439,7 +439,6 @@ void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry)
 	if (dentry == NULL)
 	if (dentry == NULL)
 		return;
 		return;
 
 
-	d_set_d_op(dentry, NFS_PROTO(dir)->dentry_ops);
 	inode = nfs_fhget(dentry->d_sb, entry->fh, entry->fattr);
 	inode = nfs_fhget(dentry->d_sb, entry->fh, entry->fattr);
 	if (IS_ERR(inode))
 	if (IS_ERR(inode))
 		goto out;
 		goto out;
@@ -1193,8 +1192,6 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru
 	if (dentry->d_name.len > NFS_SERVER(dir)->namelen)
 	if (dentry->d_name.len > NFS_SERVER(dir)->namelen)
 		goto out;
 		goto out;
 
 
-	d_set_d_op(dentry, NFS_PROTO(dir)->dentry_ops);
-
 	/*
 	/*
 	 * If we're doing an exclusive create, optimize away the lookup
 	 * If we're doing an exclusive create, optimize away the lookup
 	 * but don't hash the dentry.
 	 * but don't hash the dentry.
@@ -1338,7 +1335,6 @@ static struct dentry *nfs_atomic_lookup(struct inode *dir, struct dentry *dentry
 		res = ERR_PTR(-ENAMETOOLONG);
 		res = ERR_PTR(-ENAMETOOLONG);
 		goto out;
 		goto out;
 	}
 	}
-	d_set_d_op(dentry, NFS_PROTO(dir)->dentry_ops);
 
 
 	/* Let vfs_create() deal with O_EXCL. Instantiate, but don't hash
 	/* Let vfs_create() deal with O_EXCL. Instantiate, but don't hash
 	 * the dentry. */
 	 * the dentry. */

+ 0 - 6
fs/nfs/getroot.c

@@ -119,9 +119,6 @@ struct dentry *nfs_get_root(struct super_block *sb, struct nfs_fh *mntfh)
 	}
 	}
 
 
 	security_d_instantiate(ret, inode);
 	security_d_instantiate(ret, inode);
-
-	if (ret->d_op == NULL)
-		d_set_d_op(ret, server->nfs_client->rpc_ops->dentry_ops);
 out:
 out:
 	nfs_free_fattr(fsinfo.fattr);
 	nfs_free_fattr(fsinfo.fattr);
 	return ret;
 	return ret;
@@ -227,9 +224,6 @@ struct dentry *nfs4_get_root(struct super_block *sb, struct nfs_fh *mntfh)
 
 
 	security_d_instantiate(ret, inode);
 	security_d_instantiate(ret, inode);
 
 
-	if (ret->d_op == NULL)
-		d_set_d_op(ret, server->nfs_client->rpc_ops->dentry_ops);
-
 out:
 out:
 	nfs_free_fattr(fattr);
 	nfs_free_fattr(fattr);
 	dprintk("<-- nfs4_get_root()\n");
 	dprintk("<-- nfs4_get_root()\n");

+ 1 - 0
fs/nfs/super.c

@@ -2202,6 +2202,7 @@ static int nfs_set_super(struct super_block *s, void *data)
 
 
 	s->s_flags = sb_mntdata->mntflags;
 	s->s_flags = sb_mntdata->mntflags;
 	s->s_fs_info = server;
 	s->s_fs_info = server;
+	s->s_d_op = server->nfs_client->rpc_ops->dentry_ops;
 	ret = set_anon_super(s, server);
 	ret = set_anon_super(s, server);
 	if (ret == 0)
 	if (ret == 0)
 		server->s_dev = s->s_dev;
 		server->s_dev = s->s_dev;