Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 84787
b: refs/heads/master
c: 969729d
h: refs/heads/master
i:
  84785: 56fbce7
  84783: 110e2f0
v: v3
  • Loading branch information
Miklos Szeredi authored and Linus Torvalds committed Feb 8, 2008
1 parent e0ab873 commit deee30a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e9b3961b66bb1e93762895d809be074ea109c77c
refs/heads/master: 969729d56ef2c8b709844bc0071805f86dfbd2f9
5 changes: 5 additions & 0 deletions trunk/fs/afs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ static const struct super_operations afs_super_ops = {
.clear_inode = afs_clear_inode,
.umount_begin = afs_umount_begin,
.put_super = afs_put_super,
.show_options = generic_show_options,
};

static struct kmem_cache *afs_inode_cachep;
Expand Down Expand Up @@ -357,6 +358,7 @@ static int afs_get_sb(struct file_system_type *fs_type,
struct super_block *sb;
struct afs_volume *vol;
struct key *key;
char *new_opts = kstrdup(options, GFP_KERNEL);
int ret;

_enter(",,%s,%p", dev_name, options);
Expand Down Expand Up @@ -408,9 +410,11 @@ static int afs_get_sb(struct file_system_type *fs_type,
deactivate_super(sb);
goto error;
}
sb->s_options = new_opts;
sb->s_flags |= MS_ACTIVE;
} else {
_debug("reuse");
kfree(new_opts);
ASSERTCMP(sb->s_flags, &, MS_ACTIVE);
}

Expand All @@ -424,6 +428,7 @@ static int afs_get_sb(struct file_system_type *fs_type,
afs_put_volume(params.volume);
afs_put_cell(params.cell);
key_put(params.key);
kfree(new_opts);
_leave(" = %d", ret);
return ret;
}
Expand Down

0 comments on commit deee30a

Please sign in to comment.