Commit 7551b8b5 authored by Nathaniel Clark's avatar Nathaniel Clark Committed by Greg Kroah-Hartman

staging/lustre/llite: Fix Multiple Assignments

Fix all multiple assignments on lustre/llite directory.
Signed-off-by: default avatarNathaniel Clark <nathaniel.l.clark@intel.com>
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 95c9c008
...@@ -864,7 +864,8 @@ int ll_fill_super(struct super_block *sb, struct vfsmount *mnt) ...@@ -864,7 +864,8 @@ int ll_fill_super(struct super_block *sb, struct vfsmount *mnt)
try_module_get(THIS_MODULE); try_module_get(THIS_MODULE);
/* client additional sb info */ /* client additional sb info */
lsi->lsi_llsbi = sbi = ll_init_sbi(sb); sbi = ll_init_sbi(sb);
lsi->lsi_llsbi = sbi;
if (!sbi) { if (!sbi) {
module_put(THIS_MODULE); module_put(THIS_MODULE);
kfree(cfg); kfree(cfg);
......
...@@ -318,7 +318,8 @@ static struct dentry *ll_find_alias(struct inode *inode, struct dentry *dentry) ...@@ -318,7 +318,8 @@ static struct dentry *ll_find_alias(struct inode *inode, struct dentry *dentry)
if (hlist_empty(&inode->i_dentry)) if (hlist_empty(&inode->i_dentry))
return NULL; return NULL;
discon_alias = invalid_alias = NULL; discon_alias = NULL;
invalid_alias = NULL;
ll_lock_dcache(inode); ll_lock_dcache(inode);
hlist_for_each_entry(alias, &inode->i_dentry, d_u.d_alias) { hlist_for_each_entry(alias, &inode->i_dentry, d_u.d_alias) {
......
...@@ -954,7 +954,8 @@ static int vvp_io_write_start(const struct lu_env *env, ...@@ -954,7 +954,8 @@ static int vvp_io_write_start(const struct lu_env *env,
* out-of-order writes. * out-of-order writes.
*/ */
ll_merge_attr(env, inode); ll_merge_attr(env, inode);
pos = io->u.ci_wr.wr.crw_pos = i_size_read(inode); pos = i_size_read(inode);
io->u.ci_wr.wr.crw_pos = pos;
vio->vui_iocb->ki_pos = pos; vio->vui_iocb->ki_pos = pos;
} else { } else {
LASSERT(vio->vui_iocb->ki_pos == pos); LASSERT(vio->vui_iocb->ki_pos == pos);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment