diff options
| author | Tejun Heo <tj@kernel.org> | 2014-02-08 10:37:44 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-02-08 10:37:44 -0500 |
| commit | f7cef064aa01a1ac682c1945cc168b878cb118ff (patch) | |
| tree | 5dc256a4e01689eed60ab3e7a7ab8e50c5bcf602 /fs/kernfs/symlink.c | |
| parent | 1a698a4aba26dd58e8409d325a9a9db22f7cd2db (diff) | |
| parent | ba341d55a420ab4fdd1a53fd395fd59bd65de880 (diff) | |
Merge branch 'driver-core-next' into cgroup/for-3.15
Pending kernfs conversion depends on kernfs improvements in
driver-core-next. Pull it into for-3.15.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'fs/kernfs/symlink.c')
| -rw-r--r-- | fs/kernfs/symlink.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c index 4d457055acb..8a198898e39 100644 --- a/fs/kernfs/symlink.c +++ b/fs/kernfs/symlink.c @@ -27,7 +27,6 @@ struct kernfs_node *kernfs_create_link(struct kernfs_node *parent, struct kernfs_node *target) { struct kernfs_node *kn; - struct kernfs_addrm_cxt acxt; int error; kn = kernfs_new_node(parent, name, S_IFLNK|S_IRWXUGO, KERNFS_LINK); @@ -39,10 +38,7 @@ struct kernfs_node *kernfs_create_link(struct kernfs_node *parent, kn->symlink.target_kn = target; kernfs_get(target); /* ref owned by symlink */ - kernfs_addrm_start(&acxt); - error = kernfs_add_one(&acxt, kn); - kernfs_addrm_finish(&acxt); - + error = kernfs_add_one(kn); if (!error) return kn; |