diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-01-11 01:23:41 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-01-11 01:23:41 +0300 |
| commit | 274353674dd0337bdeeaee08a9f2047777b07ab0 (patch) | |
| tree | b788d77dd7c0e8f27bbcc89fc742c212c28872c0 /fs/nfs/getroot.c | |
| parent | 1740d483ba4d79f9fa6984dccd7152b6b208f1bf (diff) | |
| parent | d7cd5c73cec2dfa9f259a2adcf802c9f8fcc125f (diff) | |
| download | linux-274353674dd0337bdeeaee08a9f2047777b07ab0.tar.xz | |
Merge branch 'ehci-omap-clock' into omap-fixes
Diffstat (limited to 'fs/nfs/getroot.c')
| -rw-r--r-- | fs/nfs/getroot.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c index ac7b814ce162..5596c6a2881e 100644 --- a/fs/nfs/getroot.c +++ b/fs/nfs/getroot.c @@ -63,9 +63,11 @@ static int nfs_superblock_set_dummy_root(struct super_block *sb, struct inode *i * This again causes shrink_dcache_for_umount_subtree() to * Oops, since the test for IS_ROOT() will fail. */ - spin_lock(&dcache_lock); + spin_lock(&sb->s_root->d_inode->i_lock); + spin_lock(&sb->s_root->d_lock); list_del_init(&sb->s_root->d_alias); - spin_unlock(&dcache_lock); + spin_unlock(&sb->s_root->d_lock); + spin_unlock(&sb->s_root->d_inode->i_lock); } return 0; } @@ -119,7 +121,7 @@ struct dentry *nfs_get_root(struct super_block *sb, struct nfs_fh *mntfh) security_d_instantiate(ret, inode); if (ret->d_op == NULL) - ret->d_op = server->nfs_client->rpc_ops->dentry_ops; + d_set_d_op(ret, server->nfs_client->rpc_ops->dentry_ops); out: nfs_free_fattr(fsinfo.fattr); return ret; @@ -226,7 +228,7 @@ struct dentry *nfs4_get_root(struct super_block *sb, struct nfs_fh *mntfh) security_d_instantiate(ret, inode); if (ret->d_op == NULL) - ret->d_op = server->nfs_client->rpc_ops->dentry_ops; + d_set_d_op(ret, server->nfs_client->rpc_ops->dentry_ops); out: nfs_free_fattr(fattr); |