branch: HEAD

really send setattr cookies to OSTs.
b=20756
r=wangdi
r=tappro

diff --git a/lustre/obdclass/llog_ioctl.c b/lustre/obdclass/llog_ioctl.c
index 8d57e18..ca1877e 100644 (file)
--- a/lustre/obdclass/llog_ioctl.c
+++ b/lustre/obdclass/llog_ioctl.c
@@ -147,6 +147,7 @@ static int llog_check_cb(struct llog_handle *handle, struct llog_rec_hdr *rec,
                 case OST_RAID1_REC:
                 case MDS_UNLINK_REC:
                 case MDS_SETATTR_REC:
+                case MDS_SETATTR64_REC:
                 case OBD_CFG_REC:
                 case LLOG_HDR_MAGIC: {
                          l = snprintf(out, remains, "[index]: %05d  [type]: "

diff --git a/lustre/obdclass/llog_lvfs.c b/lustre/obdclass/llog_lvfs.c
index 8b59d00..cb83ed2 100644 (file)
--- a/lustre/obdclass/llog_lvfs.c
+++ b/lustre/obdclass/llog_lvfs.c
@@ -367,7 +367,8 @@ static int llog_lvfs_write_rec(struct llog_handle *loghandle,
                 reccookie->lgc_lgl = loghandle->lgh_id;
                 reccookie->lgc_index = index;
                 if ((rec->lrh_type == MDS_UNLINK_REC) ||
-                                (rec->lrh_type == MDS_SETATTR_REC))
+                    (rec->lrh_type == MDS_SETATTR_REC) ||
+                    (rec->lrh_type == MDS_SETATTR64_REC))
                         reccookie->lgc_subsys = LLOG_MDS_OST_ORIG_CTXT;
                 else if (rec->lrh_type == OST_SZ_REC)
                         reccookie->lgc_subsys = LLOG_SIZE_ORIG_CTXT;

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 65b1436..674be0c 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -385,15 +385,13 @@ static int osc_setattr_async(struct obd_export *exp, struct obd_info *oinfo,
                 RETURN(rc);
         }
 
+        if (oinfo->oi_oa->o_valid & OBD_MD_FLCOOKIE)
+                oinfo->oi_oa->o_lcookie = *oti->oti_logcookies;
+
         osc_pack_req_body(req, oinfo);
 
         ptlrpc_request_set_replen(req);
 
-        if (oinfo->oi_oa->o_valid & OBD_MD_FLCOOKIE) {
-                LASSERT(oti);
-                oinfo->oi_oa->o_lcookie = *oti->oti_logcookies;
-        }
-
         /* do mds to ost setattr asynchronously */
         if (!rqset) {
                 /* Do not wait for response. */