diff options
author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2007-03-29 04:20:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-29 11:22:25 -0400 |
commit | 75e8defbe4236a358b1396bc6d9a1231e5eca225 (patch) | |
tree | df2c475d349f0756b2318adb4fe7216e58b39cec | |
parent | 622e696938c6a9c5357d2ec4a07ed2f27d56925a (diff) |
[PATCH] uml: hostfs variable renaming
* rename name to host_root_path
* rename data to req_root.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/hostfs/hostfs_kern.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index a2667db9f6b9..fd301a910122 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c | |||
@@ -938,7 +938,7 @@ static const struct address_space_operations hostfs_link_aops = { | |||
938 | static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent) | 938 | static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent) |
939 | { | 939 | { |
940 | struct inode *root_inode; | 940 | struct inode *root_inode; |
941 | char *name, *data = d; | 941 | char *host_root_path, *req_root = d; |
942 | int err; | 942 | int err; |
943 | 943 | ||
944 | sb->s_blocksize = 1024; | 944 | sb->s_blocksize = 1024; |
@@ -947,16 +947,16 @@ static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent) | |||
947 | sb->s_op = &hostfs_sbops; | 947 | sb->s_op = &hostfs_sbops; |
948 | 948 | ||
949 | /* NULL is printed as <NULL> by sprintf: avoid that. */ | 949 | /* NULL is printed as <NULL> by sprintf: avoid that. */ |
950 | if (data == NULL) | 950 | if (req_root == NULL) |
951 | data = ""; | 951 | req_root = ""; |
952 | 952 | ||
953 | err = -ENOMEM; | 953 | err = -ENOMEM; |
954 | name = kmalloc(strlen(root_ino) + 1 | 954 | host_root_path = kmalloc(strlen(root_ino) + 1 |
955 | + strlen(data) + 1, GFP_KERNEL); | 955 | + strlen(req_root) + 1, GFP_KERNEL); |
956 | if(name == NULL) | 956 | if(host_root_path == NULL) |
957 | goto out; | 957 | goto out; |
958 | 958 | ||
959 | sprintf(name, "%s/%s", root_ino, data); | 959 | sprintf(host_root_path, "%s/%s", root_ino, req_root); |
960 | 960 | ||
961 | root_inode = iget(sb, 0); | 961 | root_inode = iget(sb, 0); |
962 | if(root_inode == NULL) | 962 | if(root_inode == NULL) |
@@ -966,10 +966,10 @@ static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent) | |||
966 | if(err) | 966 | if(err) |
967 | goto out_put; | 967 | goto out_put; |
968 | 968 | ||
969 | HOSTFS_I(root_inode)->host_filename = name; | 969 | HOSTFS_I(root_inode)->host_filename = host_root_path; |
970 | /* Avoid that in the error path, iput(root_inode) frees again name through | 970 | /* Avoid that in the error path, iput(root_inode) frees again |
971 | * hostfs_destroy_inode! */ | 971 | * host_root_path through hostfs_destroy_inode! */ |
972 | name = NULL; | 972 | host_root_path = NULL; |
973 | 973 | ||
974 | err = -ENOMEM; | 974 | err = -ENOMEM; |
975 | sb->s_root = d_alloc_root(root_inode); | 975 | sb->s_root = d_alloc_root(root_inode); |
@@ -989,7 +989,7 @@ static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent) | |||
989 | out_put: | 989 | out_put: |
990 | iput(root_inode); | 990 | iput(root_inode); |
991 | out_free: | 991 | out_free: |
992 | kfree(name); | 992 | kfree(host_root_path); |
993 | out: | 993 | out: |
994 | return(err); | 994 | return(err); |
995 | } | 995 | } |