From 3612b3b03fc6760f42f86f545e3de478b402e7ae Mon Sep 17 00:00:00 2001 From: lsy Date: Thu, 19 Oct 2006 14:05:15 +0000 Subject: [PATCH] minor cleanup. --- lustre/mdc/mdc_locks.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c index ff1d836..aaadeee 100644 --- a/lustre/mdc/mdc_locks.c +++ b/lustre/mdc/mdc_locks.c @@ -309,7 +309,7 @@ int mdc_enqueue(struct obd_export *exp, if (!req) RETURN(-ENOMEM); - if (it->it_flags & O_JOIN_FILE) { + if (do_join) { __u64 head_size = *(__u32*)cb_data; __u32 tsize = *(__u32*)lmm; @@ -339,8 +339,8 @@ int mdc_enqueue(struct obd_export *exp, /* for remote client, fetch remote perm for current user */ repsize[repbufcnt++] = client_is_remote(exp) ? - sizeof(struct mdt_remote_perm) : - LUSTRE_POSIX_ACL_MAX_SIZE; + sizeof(struct mdt_remote_perm) : + LUSTRE_POSIX_ACL_MAX_SIZE; repsize[repbufcnt++] = sizeof(struct lustre_capa); repsize[repbufcnt++] = sizeof(struct lustre_capa); } else if (it->it_op & IT_UNLINK) { @@ -371,7 +371,7 @@ int mdc_enqueue(struct obd_export *exp, OBD_MD_FLACL; size[DLM_INTENT_REC_OFF] = sizeof(struct mdt_body); size[DLM_INTENT_REC_OFF + 1] = op_data->mod_capa1 ? - sizeof(struct lustre_capa) : 0; + sizeof(struct lustre_capa) : 0; size[DLM_INTENT_REC_OFF + 2] = op_data->namelen + 1; if (it->it_op & IT_GETATTR) @@ -392,8 +392,8 @@ int mdc_enqueue(struct obd_export *exp, it->it_flags, op_data); repsize[repbufcnt++] = client_is_remote(exp) ? - sizeof(struct mdt_remote_perm) : - LUSTRE_POSIX_ACL_MAX_SIZE; + sizeof(struct mdt_remote_perm) : + LUSTRE_POSIX_ACL_MAX_SIZE; repsize[repbufcnt++] = sizeof(struct lustre_capa); } else if (it->it_op == IT_READDIR) { policy.l_inodebits.bits = MDS_INODELOCK_UPDATE; -- 1.8.3.1