apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

kernfs: drop s_ prefix from kernfs_node members

Browse Source 
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.

s_ prefix for kernfs members is used inconsistently and a misnomer
now.  It's not like kernfs_node is used widely across the kernel
making the ability to grep for the members particularly useful.  Let's
just drop the prefix.

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>
This commit is contained in:
Tejun Heo
2013-12-11 14:11:54 -05:00
committed by Greg Kroah-Hartman
parent 324a56e16e
commit adc5e8b58f
9 changed files with 193 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/kernfs/symlink.c
+16 -16
View File
@@ -36,8 +36,8 @@ struct kernfs_node *kernfs_create_link(struct kernfs_node *parent,
return ERR_PTR(-ENOMEM);
if (kernfs_ns_enabled(parent))
kn->s_ns = target->s_ns;
kn->s_symlink.target_kn = target;
kn->ns = target->ns;
kn->symlink.target_kn = target;
kernfs_get(target); /* ref owned by symlink */
sysfs_addrm_start(&acxt);
@@ -60,24 +60,24 @@ static int sysfs_get_target_path(struct kernfs_node *parent,
/* go up to the root, stop at the base */
base = parent;
while (base->s_parent) {
kn = target->s_parent;
while (kn->s_parent && base != kn)
kn = kn->s_parent;
while (base->parent) {
kn = target->parent;
while (kn->parent && base != kn)
kn = kn->parent;
if (base == kn)
break;
strcpy(s, "../");
s += 3;
base = base->s_parent;
base = base->parent;
}
/* determine end of target string for reverse fillup */
kn = target;
while (kn->s_parent && kn != base) {
len += strlen(kn->s_name) + 1;
kn = kn->s_parent;
while (kn->parent && kn != base) {
len += strlen(kn->name) + 1;
kn = kn->parent;
}
/* check limits */
@@ -89,15 +89,15 @@ static int sysfs_get_target_path(struct kernfs_node *parent,
/* reverse fillup of target string from target to base */
kn = target;
while (kn->s_parent && kn != base) {
int slen = strlen(kn->s_name);
while (kn->parent && kn != base) {
int slen = strlen(kn->name);
len -= slen;
strncpy(s + len, kn->s_name, slen);
strncpy(s + len, kn->name, slen);
if (len)
s[--len] = '/';
kn = kn->s_parent;
kn = kn->parent;
}
return 0;
@@ -106,8 +106,8 @@ static int sysfs_get_target_path(struct kernfs_node *parent,
static int sysfs_getlink(struct dentry *dentry, char *path)
{
struct kernfs_node *kn = dentry->d_fsdata;
struct kernfs_node *parent = kn->s_parent;
struct kernfs_node *target = kn->s_symlink.target_kn;
struct kernfs_node *parent = kn->parent;
struct kernfs_node *target = kn->symlink.target_kn;
int error;
mutex_lock(&sysfs_mutex);