diff options
Diffstat (limited to 'fs/afs/super.c')
-rw-r--r-- | fs/afs/super.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/afs/super.c b/fs/afs/super.c index 3623c952b6ff..65081ec3c36e 100644 --- a/fs/afs/super.c +++ b/fs/afs/super.c | |||
@@ -154,7 +154,7 @@ static int afs_show_devname(struct seq_file *m, struct dentry *root) | |||
154 | seq_puts(m, "none"); | 154 | seq_puts(m, "none"); |
155 | return 0; | 155 | return 0; |
156 | } | 156 | } |
157 | 157 | ||
158 | switch (volume->type) { | 158 | switch (volume->type) { |
159 | case AFSVL_RWVOL: | 159 | case AFSVL_RWVOL: |
160 | break; | 160 | break; |
@@ -269,7 +269,7 @@ static int afs_parse_device_name(struct afs_mount_params *params, | |||
269 | int cellnamesz; | 269 | int cellnamesz; |
270 | 270 | ||
271 | _enter(",%s", name); | 271 | _enter(",%s", name); |
272 | 272 | ||
273 | if (!name) { | 273 | if (!name) { |
274 | printk(KERN_ERR "kAFS: no volume name specified\n"); | 274 | printk(KERN_ERR "kAFS: no volume name specified\n"); |
275 | return -EINVAL; | 275 | return -EINVAL; |
@@ -418,7 +418,10 @@ static int afs_fill_super(struct super_block *sb, | |||
418 | if (!sb->s_root) | 418 | if (!sb->s_root) |
419 | goto error; | 419 | goto error; |
420 | 420 | ||
421 | sb->s_d_op = &afs_fs_dentry_operations; | 421 | if (params->dyn_root) |
422 | sb->s_d_op = &afs_dynroot_dentry_operations; | ||
423 | else | ||
424 | sb->s_d_op = &afs_fs_dentry_operations; | ||
422 | 425 | ||
423 | _leave(" = 0"); | 426 | _leave(" = 0"); |
424 | return 0; | 427 | return 0; |
@@ -676,7 +679,7 @@ static int afs_statfs(struct dentry *dentry, struct kstatfs *buf) | |||
676 | buf->f_bfree = 0; | 679 | buf->f_bfree = 0; |
677 | return 0; | 680 | return 0; |
678 | } | 681 | } |
679 | 682 | ||
680 | key = afs_request_key(vnode->volume->cell); | 683 | key = afs_request_key(vnode->volume->cell); |
681 | if (IS_ERR(key)) | 684 | if (IS_ERR(key)) |
682 | return PTR_ERR(key); | 685 | return PTR_ERR(key); |