Skip to content

Commit

Permalink
switch nfs to ->s_d_op
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Jan 13, 2011
1 parent 96e1391 commit 8b244ff
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 10 deletions.
4 changes: 0 additions & 4 deletions fs/nfs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,6 @@ void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry)
if (dentry == NULL)
return;

d_set_d_op(dentry, NFS_PROTO(dir)->dentry_ops);
inode = nfs_fhget(dentry->d_sb, entry->fh, entry->fattr);
if (IS_ERR(inode))
goto out;
Expand Down Expand Up @@ -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)
goto out;

d_set_d_op(dentry, NFS_PROTO(dir)->dentry_ops);

/*
* If we're doing an exclusive create, optimize away the lookup
* but don't hash the dentry.
Expand Down Expand Up @@ -1338,7 +1335,6 @@ static struct dentry *nfs_atomic_lookup(struct inode *dir, struct dentry *dentry
res = ERR_PTR(-ENAMETOOLONG);
goto out;
}
d_set_d_op(dentry, NFS_PROTO(dir)->dentry_ops);

/* Let vfs_create() deal with O_EXCL. Instantiate, but don't hash
* the dentry. */
Expand Down
6 changes: 0 additions & 6 deletions fs/nfs/getroot.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,6 @@ struct dentry *nfs_get_root(struct super_block *sb, struct nfs_fh *mntfh)
}

security_d_instantiate(ret, inode);

if (ret->d_op == NULL)
d_set_d_op(ret, server->nfs_client->rpc_ops->dentry_ops);
out:
nfs_free_fattr(fsinfo.fattr);
return ret;
Expand Down Expand Up @@ -227,9 +224,6 @@ struct dentry *nfs4_get_root(struct super_block *sb, struct nfs_fh *mntfh)

security_d_instantiate(ret, inode);

if (ret->d_op == NULL)
d_set_d_op(ret, server->nfs_client->rpc_ops->dentry_ops);

out:
nfs_free_fattr(fattr);
dprintk("<-- nfs4_get_root()\n");
Expand Down
1 change: 1 addition & 0 deletions fs/nfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -2202,6 +2202,7 @@ static int nfs_set_super(struct super_block *s, void *data)

s->s_flags = sb_mntdata->mntflags;
s->s_fs_info = server;
s->s_d_op = server->nfs_client->rpc_ops->dentry_ops;
ret = set_anon_super(s, server);
if (ret == 0)
server->s_dev = s->s_dev;
Expand Down

0 comments on commit 8b244ff

Please sign in to comment.