diff options
| author | NeilBrown <neilb@suse.de> | 2012-08-01 06:40:02 -0400 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2012-08-01 06:40:02 -0400 |
| commit | bb181e2e48f8c85db08c9cb015cbba9618dbf05c (patch) | |
| tree | 191bc24dd97bcb174535cc217af082f16da3b43d /fs/nfs/getroot.c | |
| parent | d57368afe63b3b7b45ce6c2b8c5276417935be2f (diff) | |
| parent | c039c332f23e794deb6d6f37b9f07ff3b27fb2cf (diff) | |
Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md
Pull in pre-requisites for adding raid10 support to dm-raid.
Diffstat (limited to 'fs/nfs/getroot.c')
| -rw-r--r-- | fs/nfs/getroot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c index 8abfb19bd3aa..a67990f90bd7 100644 --- a/fs/nfs/getroot.c +++ b/fs/nfs/getroot.c | |||
| @@ -62,7 +62,7 @@ static int nfs_superblock_set_dummy_root(struct super_block *sb, struct inode *i | |||
| 62 | */ | 62 | */ |
| 63 | spin_lock(&sb->s_root->d_inode->i_lock); | 63 | spin_lock(&sb->s_root->d_inode->i_lock); |
| 64 | spin_lock(&sb->s_root->d_lock); | 64 | spin_lock(&sb->s_root->d_lock); |
| 65 | list_del_init(&sb->s_root->d_alias); | 65 | hlist_del_init(&sb->s_root->d_alias); |
| 66 | spin_unlock(&sb->s_root->d_lock); | 66 | spin_unlock(&sb->s_root->d_lock); |
| 67 | spin_unlock(&sb->s_root->d_inode->i_lock); | 67 | spin_unlock(&sb->s_root->d_inode->i_lock); |
| 68 | } | 68 | } |