LU-3534 osp: move RPC pack from declare to execution phase

[fs/lustre-release.git] / lustre / include / lustre_fid.h

diff --git a/lustre/include/lustre_fid.h b/lustre/include/lustre_fid.h
index 92b12e4..f325849 100644 (file)
--- a/lustre/include/lustre_fid.h
+++ b/lustre/include/lustre_fid.h
@@ -236,7 +236,9 @@ enum local_oid {
        MDD_LOV_OBJ_OSEQ        = 4121UL,
        LFSCK_NAMESPACE_OID     = 4122UL,
        REMOTE_PARENT_DIR_OID   = 4123UL,
-       SLAVE_LLOG_CATALOGS_OID = 4124UL,
+       /* This definition is obsolete
+        * SLAVE_LLOG_CATALOGS_OID      = 4124UL,
+        */
 };
 
 static inline void lu_local_obj_fid(struct lu_fid *fid, __u32 oid)
@@ -259,7 +261,7 @@ static inline void lu_local_name_obj_fid(struct lu_fid *fid, __u32 oid)
 static inline int fid_is_root(const struct lu_fid *fid)
 {
        return unlikely((fid_seq(fid) == FID_SEQ_ROOT &&
-                        fid_oid(fid) == 1));
+                        fid_oid(fid) == FID_OID_ROOT));
 }
 
 static inline int fid_is_dot_lustre(const struct lu_fid *fid)
@@ -413,7 +415,7 @@ struct lu_server_seq {
         /* LUSTRE_SEQ_SERVER or LUSTRE_SEQ_CONTROLLER */
         enum lu_mgr_type       lss_type;
 
-        /* Client interafce to request controller */
+       /* Client interface to request controller */
         struct lu_client_seq   *lss_cli;
 
         /* Mutex for protecting allocation */