UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging/lustre/llite: Fix Multiple Assignments 

Fix all multiple assignments on lustre/llite directory.

Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Nathaniel Clark 2016-06-09 22:35:14 -04:00 committed by Greg Kroah-Hartman
parent 95c9c00886
commit 7551b8b5a9
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/lustre/lustre/llite/llite_lib.c
View File

@ -864,7 +864,8 @@ int ll_fill_super(struct super_block *sb, struct vfsmount *mnt)
try_module_get(THIS_MODULE);
/* client additional sb info */
lsi->lsi_llsbi = sbi = ll_init_sbi(sb);
sbi = ll_init_sbi(sb);
lsi->lsi_llsbi = sbi;
if (!sbi) {
module_put(THIS_MODULE);
kfree(cfg);

3
drivers/staging/lustre/lustre/llite/namei.c
View File

@ -318,7 +318,8 @@ static struct dentry *ll_find_alias(struct inode *inode, struct dentry *dentry)
if (hlist_empty(&inode->i_dentry))
return NULL;
discon_alias = invalid_alias = NULL;
discon_alias = NULL;
invalid_alias = NULL;
ll_lock_dcache(inode);
hlist_for_each_entry(alias, &inode->i_dentry, d_u.d_alias) {

3
drivers/staging/lustre/lustre/llite/vvp_io.c
View File

@ -954,7 +954,8 @@ static int vvp_io_write_start(const struct lu_env *env,
* out-of-order writes.
*/
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;
} else {
LASSERT(vio->vui_iocb->ki_pos == pos);