Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
fs
/
hostfs
/
hostfs_kern.c
diff --git
a/kernel/fs/hostfs/hostfs_kern.c
b/kernel/fs/hostfs/hostfs_kern.c
index
de2d624
..
f34d6f5
100644
(file)
--- a/
kernel/fs/hostfs/hostfs_kern.c
+++ b/
kernel/fs/hostfs/hostfs_kern.c
@@
-730,15
+730,13
@@
static int hostfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
init_special_inode(inode, mode, dev);
err = do_mknod(name, mode, MAJOR(dev), MINOR(dev));
init_special_inode(inode, mode, dev);
err = do_mknod(name, mode, MAJOR(dev), MINOR(dev));
- if (
!
err)
+ if (err)
goto out_free;
err = read_name(inode, name);
__putname(name);
if (err)
goto out_put;
goto out_free;
err = read_name(inode, name);
__putname(name);
if (err)
goto out_put;
- if (err)
- goto out_put;
d_instantiate(dentry, inode);
return 0;
d_instantiate(dentry, inode);
return 0;
@@
-892,7
+890,7
@@
static const struct inode_operations hostfs_dir_iops = {
.setattr = hostfs_setattr,
};
.setattr = hostfs_setattr,
};
-static
void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd
)
+static
const char *hostfs_follow_link(struct dentry *dentry, void **cookie
)
{
char *link = __getname();
if (link) {
{
char *link = __getname();
if (link) {
@@
-906,21
+904,18
@@
static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
}
if (err < 0) {
__putname(link);
}
if (err < 0) {
__putname(link);
-
link =
ERR_PTR(err);
+
return
ERR_PTR(err);
}
} else {
}
} else {
-
link =
ERR_PTR(-ENOMEM);
+
return
ERR_PTR(-ENOMEM);
}
}
- nd_set_link(nd, link);
- return NULL;
+ return *cookie = link;
}
}
-static void hostfs_put_link(struct
dentry *dentry, struct nameidata *n
d, void *cookie)
+static void hostfs_put_link(struct
inode *unuse
d, void *cookie)
{
{
- char *s = nd_get_link(nd);
- if (!IS_ERR(s))
- __putname(s);
+ __putname(cookie);
}
static const struct inode_operations hostfs_link_iops = {
}
static const struct inode_operations hostfs_link_iops = {
@@
-964,10
+959,11
@@
static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent)
if (S_ISLNK(root_inode->i_mode)) {
char *name = follow_link(host_root_path);
if (S_ISLNK(root_inode->i_mode)) {
char *name = follow_link(host_root_path);
- if (IS_ERR(name))
+ if (IS_ERR(name))
{
err = PTR_ERR(name);
err = PTR_ERR(name);
- else
- err = read_name(root_inode, name);
+ goto out_put;
+ }
+ err = read_name(root_inode, name);
kfree(name);
if (err)
goto out_put;
kfree(name);
if (err)
goto out_put;