diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2008-02-08 04:21:37 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 09:22:39 -0800 |
commit | 969729d56ef2c8b709844bc0071805f86dfbd2f9 (patch) | |
tree | a527f19a96b31774d9344e52a9f2b98b364f8839 /fs/afs | |
parent | e9b3961b66bb1e93762895d809be074ea109c77c (diff) | |
download | linux-stable-969729d56ef2c8b709844bc0071805f86dfbd2f9.tar.gz linux-stable-969729d56ef2c8b709844bc0071805f86dfbd2f9.tar.bz2 linux-stable-969729d56ef2c8b709844bc0071805f86dfbd2f9.zip |
mount options: fix afs
Add a .show_options super operation to afs.
Use generic_show_options() and save the complete option string in
afs_get_sb().
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/afs')
-rw-r--r-- | fs/afs/super.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/afs/super.c b/fs/afs/super.c index 4b2558c42213..36bbce45f44b 100644 --- a/fs/afs/super.c +++ b/fs/afs/super.c @@ -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; @@ -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); @@ -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); } @@ -424,6 +428,7 @@ error: afs_put_volume(params.volume); afs_put_cell(params.cell); key_put(params.key); + kfree(new_opts); _leave(" = %d", ret); return ret; } |