aboutsummaryrefslogtreecommitdiffstats
path: root/fs/kernfs/symlink.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-12-11 14:11:58 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-11 20:39:20 -0500
commitc637b8acbe079edb477d887041755b489036f146 (patch)
tree7d6e856930752574bb1d56b56bea5a2bf816de72 /fs/kernfs/symlink.c
parenta797bfc30532388e8a11ca726df60cdd77aa8675 (diff)
kernfs: s/sysfs/kernfs/ in internal functions and whatever is left
kernfs has just been separated out from sysfs and we're already in full conflict mode. Nothing can make the situation any worse. Let's take the chance to name things properly. This patch performs the following renames. * s/sysfs_*()/kernfs_*()/ in all internal functions * s/sysfs/kernfs/ in internal strings, comments and whatever is remaining * Uniformly rename various vfs operations so that they're consistently named and distinguishable. This patch is strictly rename only and doesn't introduce any functional difference. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/kernfs/symlink.c')
-rw-r--r--fs/kernfs/symlink.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
index 4105bd04ea2f..a03e26036ef9 100644
--- a/fs/kernfs/symlink.c
+++ b/fs/kernfs/symlink.c
@@ -30,8 +30,8 @@ struct kernfs_node *kernfs_create_link(struct kernfs_node *parent,
30 struct kernfs_addrm_cxt acxt; 30 struct kernfs_addrm_cxt acxt;
31 int error; 31 int error;
32 32
33 kn = sysfs_new_dirent(kernfs_root(parent), name, S_IFLNK|S_IRWXUGO, 33 kn = kernfs_new_node(kernfs_root(parent), name, S_IFLNK|S_IRWXUGO,
34 KERNFS_LINK); 34 KERNFS_LINK);
35 if (!kn) 35 if (!kn)
36 return ERR_PTR(-ENOMEM); 36 return ERR_PTR(-ENOMEM);
37 37
@@ -40,9 +40,9 @@ struct kernfs_node *kernfs_create_link(struct kernfs_node *parent,
40 kn->symlink.target_kn = target; 40 kn->symlink.target_kn = target;
41 kernfs_get(target); /* ref owned by symlink */ 41 kernfs_get(target); /* ref owned by symlink */
42 42
43 sysfs_addrm_start(&acxt); 43 kernfs_addrm_start(&acxt);
44 error = sysfs_add_one(&acxt, kn, parent); 44 error = kernfs_add_one(&acxt, kn, parent);
45 sysfs_addrm_finish(&acxt); 45 kernfs_addrm_finish(&acxt);
46 46
47 if (!error) 47 if (!error)
48 return kn; 48 return kn;
@@ -51,8 +51,8 @@ struct kernfs_node *kernfs_create_link(struct kernfs_node *parent,
51 return ERR_PTR(error); 51 return ERR_PTR(error);
52} 52}
53 53
54static int sysfs_get_target_path(struct kernfs_node *parent, 54static int kernfs_get_target_path(struct kernfs_node *parent,
55 struct kernfs_node *target, char *path) 55 struct kernfs_node *target, char *path)
56{ 56{
57 struct kernfs_node *base, *kn; 57 struct kernfs_node *base, *kn;
58 char *s = path; 58 char *s = path;
@@ -103,7 +103,7 @@ static int sysfs_get_target_path(struct kernfs_node *parent,
103 return 0; 103 return 0;
104} 104}
105 105
106static int sysfs_getlink(struct dentry *dentry, char *path) 106static int kernfs_getlink(struct dentry *dentry, char *path)
107{ 107{
108 struct kernfs_node *kn = dentry->d_fsdata; 108 struct kernfs_node *kn = dentry->d_fsdata;
109 struct kernfs_node *parent = kn->parent; 109 struct kernfs_node *parent = kn->parent;
@@ -111,18 +111,18 @@ static int sysfs_getlink(struct dentry *dentry, char *path)
111 int error; 111 int error;
112 112
113 mutex_lock(&kernfs_mutex); 113 mutex_lock(&kernfs_mutex);
114 error = sysfs_get_target_path(parent, target, path); 114 error = kernfs_get_target_path(parent, target, path);
115 mutex_unlock(&kernfs_mutex); 115 mutex_unlock(&kernfs_mutex);
116 116
117 return error; 117 return error;
118} 118}
119 119
120static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd) 120static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
121{ 121{
122 int error = -ENOMEM; 122 int error = -ENOMEM;
123 unsigned long page = get_zeroed_page(GFP_KERNEL); 123 unsigned long page = get_zeroed_page(GFP_KERNEL);
124 if (page) { 124 if (page) {
125 error = sysfs_getlink(dentry, (char *) page); 125 error = kernfs_getlink(dentry, (char *) page);
126 if (error < 0) 126 if (error < 0)
127 free_page((unsigned long)page); 127 free_page((unsigned long)page);
128 } 128 }
@@ -130,8 +130,8 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
130 return NULL; 130 return NULL;
131} 131}
132 132
133static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, 133static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
134 void *cookie) 134 void *cookie)
135{ 135{
136 char *page = nd_get_link(nd); 136 char *page = nd_get_link(nd);
137 if (!IS_ERR(page)) 137 if (!IS_ERR(page))
@@ -139,14 +139,14 @@ static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd,
139} 139}
140 140
141const struct inode_operations kernfs_symlink_iops = { 141const struct inode_operations kernfs_symlink_iops = {
142 .setxattr = sysfs_setxattr, 142 .setxattr = kernfs_iop_setxattr,
143 .removexattr = sysfs_removexattr, 143 .removexattr = kernfs_iop_removexattr,
144 .getxattr = sysfs_getxattr, 144 .getxattr = kernfs_iop_getxattr,
145 .listxattr = sysfs_listxattr, 145 .listxattr = kernfs_iop_listxattr,
146 .readlink = generic_readlink, 146 .readlink = generic_readlink,
147 .follow_link = sysfs_follow_link, 147 .follow_link = kernfs_iop_follow_link,
148 .put_link = sysfs_put_link, 148 .put_link = kernfs_iop_put_link,
149 .setattr = sysfs_setattr, 149 .setattr = kernfs_iop_setattr,
150 .getattr = sysfs_getattr, 150 .getattr = kernfs_iop_getattr,
151 .permission = sysfs_permission, 151 .permission = kernfs_iop_permission,
152}; 152};
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-15 18:10:23 -0400