Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / lustre / lustre / llite / vvp_object.c

diff --git a/drivers/staging/lustre/lustre/llite/vvp_object.c b/drivers/staging/lustre/lustre/llite/vvp_object.c
index 2c520b0bf6caa9df6477a850ca3f109b8c4409d4..e4080ba73bf3da8aa02d3796c0cff0a87f19a3be 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/vvp_object.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_object.c
@@ -120,7 +120,7 @@ static int vvp_attr_set(const struct lu_env *env, struct cl_object *obj,
        if (0 && valid & CAT_SIZE)
                i_size_write(inode, attr->cat_size);
        /* not currently necessary */
-       if (0 && valid & (CAT_UID|CAT_GID|CAT_SIZE))
+       if (0 && valid & (CAT_UID | CAT_GID | CAT_SIZE))
                mark_inode_dirty(inode);
        return 0;
 }