]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
staging: lustre: llite: omit to update wire data
authorBobi Jam <bobijam.xu@intel.com>
Sat, 18 Feb 2017 21:47:03 +0000 (16:47 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Mar 2017 08:16:59 +0000 (09:16 +0100)
In ll_setattr_raw(), after op_data->op_attr has been copied, the attr
is updated and op_data->op_attr does not get updated afterward.

Signed-off-by: Bobi Jam <bobijam.xu@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6813
Reviewed-on: http://review.whamcloud.com/16462
Reviewed-by: Jinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: Niu Yawei <yawei.niu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/llite/llite_lib.c

index 34422df9eeb4df7637428d86298b057dcb14a694..973eee6f57d3dc6b7b1c6af2fa9652887fdfe23f 100644 (file)
@@ -1504,8 +1504,6 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import)
                goto out;
        }
 
-       op_data->op_attr = *attr;
-
        if (!hsm_import && attr->ia_valid & ATTR_SIZE) {
                /*
                 * If we are changing file size, file content is
@@ -1516,6 +1514,8 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import)
                clear_bit(LLIF_DATA_MODIFIED, &lli->lli_flags);
        }
 
+       op_data->op_attr = *attr;
+
        rc = ll_md_setattr(dentry, op_data);
        if (rc)
                goto out;