diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 07:21:27 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 07:21:27 -0400 |
| commit | e635a01ea0a16cf7cd31ecd2305870385dca9be6 (patch) | |
| tree | c7153e7dee5caf6ac90d85694ff27e4d0b606290 /fs/afs/super.c | |
| parent | 143070e74630b9557e1bb64d899ff2cc5a1dcb48 (diff) | |
| parent | 947391cfbaa3b08558844c0b187bcd0223c3f660 (diff) | |
Merge branch 'next-mtd' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'fs/afs/super.c')
| -rw-r--r-- | fs/afs/super.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/afs/super.c b/fs/afs/super.c index aee239a048cb..76828e5f8a39 100644 --- a/fs/afs/super.c +++ b/fs/afs/super.c | |||
| @@ -405,21 +405,20 @@ static int afs_get_sb(struct file_system_type *fs_type, | |||
| 405 | sb->s_flags = flags; | 405 | sb->s_flags = flags; |
| 406 | ret = afs_fill_super(sb, ¶ms); | 406 | ret = afs_fill_super(sb, ¶ms); |
| 407 | if (ret < 0) { | 407 | if (ret < 0) { |
| 408 | up_write(&sb->s_umount); | 408 | deactivate_locked_super(sb); |
| 409 | deactivate_super(sb); | ||
| 410 | goto error; | 409 | goto error; |
| 411 | } | 410 | } |
| 412 | sb->s_options = new_opts; | 411 | save_mount_options(sb, new_opts); |
| 413 | sb->s_flags |= MS_ACTIVE; | 412 | sb->s_flags |= MS_ACTIVE; |
| 414 | } else { | 413 | } else { |
| 415 | _debug("reuse"); | 414 | _debug("reuse"); |
| 416 | kfree(new_opts); | ||
| 417 | ASSERTCMP(sb->s_flags, &, MS_ACTIVE); | 415 | ASSERTCMP(sb->s_flags, &, MS_ACTIVE); |
| 418 | } | 416 | } |
| 419 | 417 | ||
| 420 | simple_set_mnt(mnt, sb); | 418 | simple_set_mnt(mnt, sb); |
| 421 | afs_put_volume(params.volume); | 419 | afs_put_volume(params.volume); |
| 422 | afs_put_cell(params.cell); | 420 | afs_put_cell(params.cell); |
| 421 | kfree(new_opts); | ||
| 423 | _leave(" = 0 [%p]", sb); | 422 | _leave(" = 0 [%p]", sb); |
| 424 | return 0; | 423 | return 0; |
| 425 | 424 | ||