diff options
| author | Vyacheslav Dubeyko | 2014-08-08 23:20:55 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-08-09 00:57:21 +0200 |
| commit | dd70edbde2627f47df118d899de6bbb55abcfdbf (patch) | |
| tree | 57043f8164a0c5a5c7e02336fefbcae473d4b953 /fs/nilfs2/sysfs.c | |
| parent | nilfs2: add /sys/fs/nilfs2/<device>/mounted_snapshots/<snapshot> group (diff) | |
| download | kernel-qcow2-linux-dd70edbde2627f47df118d899de6bbb55abcfdbf.tar.gz kernel-qcow2-linux-dd70edbde2627f47df118d899de6bbb55abcfdbf.tar.xz kernel-qcow2-linux-dd70edbde2627f47df118d899de6bbb55abcfdbf.zip | |
nilfs2: integrate sysfs support into driver
This patch integrates creation of sysfs groups and
attributes into NILFS file system driver.
It was found the issue with nilfs_sysfs_{create/delete}_snapshot_group
functions by Michael L Semon <mlsemon35@gmail.com> in the first
version of the patch:
BUG: sleeping function called from invalid context at kernel/locking/mutex.c:579
in_atomic(): 1, irqs_disabled(): 0, pid: 32676, name: umount.nilfs2
2 locks held by umount.nilfs2/32676:
#0: (&type->s_umount_key#21){++++..}, at: [<790c18e2>] deactivate_super+0x37/0x58
#1: (&(&nilfs->ns_cptree_lock)->rlock){+.+...}, at: [<791bf659>] nilfs_put_root+0x23/0x5a
Preemption disabled at:[<791bf659>] nilfs_put_root+0x23/0x5a
CPU: 0 PID: 32676 Comm: umount.nilfs2 Not tainted 3.14.0+ #2
Hardware name: Dell Computer Corporation Dimension 2350/07W080, BIOS A01 12/17/2002
Call Trace:
dump_stack+0x4b/0x75
__might_sleep+0x111/0x16f
mutex_lock_nested+0x1e/0x3ad
kernfs_remove+0x12/0x26
sysfs_remove_dir+0x3d/0x62
kobject_del+0x13/0x38
nilfs_sysfs_delete_snapshot_group+0xb/0xd
nilfs_put_root+0x2a/0x5a
nilfs_detach_log_writer+0x1ab/0x2c1
nilfs_put_super+0x13/0x68
generic_shutdown_super+0x60/0xd1
kill_block_super+0x1d/0x60
deactivate_locked_super+0x22/0x3f
deactivate_super+0x3e/0x58
mntput_no_expire+0xe2/0x141
SyS_oldumount+0x70/0xa5
syscall_call+0x7/0xb
The reason of the issue was placement of
nilfs_sysfs_{create/delete}_snapshot_group() call under
nilfs->ns_cptree_lock protection. But this protection is unnecessary and
wrong solution. The second version of the patch fixes this issue.
[fengguang.wu@intel.com: nilfs_sysfs_create_mounted_snapshots_group can be static]
Reported-by: Michael L. Semon <mlsemon35@gmail.com>
Signed-off-by: Vyacheslav Dubeyko <Vyacheslav.Dubeyko@hgst.com>
Cc: Vyacheslav Dubeyko <slava@dubeyko.com>
Cc: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Tested-by: Michael L. Semon <mlsemon35@gmail.com>
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/nilfs2/sysfs.c')
| -rw-r--r-- | fs/nilfs2/sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nilfs2/sysfs.c b/fs/nilfs2/sysfs.c index 0f6148c8121a..bbb0dcc35905 100644 --- a/fs/nilfs2/sysfs.c +++ b/fs/nilfs2/sysfs.c @@ -87,7 +87,7 @@ static struct kobj_type nilfs_##name##_ktype = { \ }; #define NILFS_DEV_INT_GROUP_FNS(name, parent_name) \ -int nilfs_sysfs_create_##name##_group(struct the_nilfs *nilfs) \ +static int nilfs_sysfs_create_##name##_group(struct the_nilfs *nilfs) \ { \ struct kobject *parent; \ struct kobject *kobj; \ @@ -106,7 +106,7 @@ int nilfs_sysfs_create_##name##_group(struct the_nilfs *nilfs) \ return err; \ return 0; \ } \ -void nilfs_sysfs_delete_##name##_group(struct the_nilfs *nilfs) \ +static void nilfs_sysfs_delete_##name##_group(struct the_nilfs *nilfs) \ { \ kobject_del(&nilfs->ns_##parent_name##_subgroups->sg_##name##_kobj); \ } |