- fix about valid field assigning

diff --git a/lustre/mds/lproc_mds.c b/lustre/mds/lproc_mds.c
index d94d8cd..dd39312 100644 (file)
--- a/lustre/mds/lproc_mds.c
+++ b/lustre/mds/lproc_mds.c
@@ -118,7 +118,8 @@ static int lprocfs_rd_group(char *page, char **start, off_t off,
         struct mds_obd *mds = &obd->u.mds;
 
         *eof = 1;
-        return snprintf(page, count, "%lu\n", (unsigned long)mds->mds_num);
+        return snprintf(page, count, "%lu\n",
+                        (unsigned long)mds->mds_num);
 }
 
 struct lprocfs_vars lprocfs_mds_obd_vars[] = {

diff --git a/lustre/mds/mds_lov.c b/lustre/mds/mds_lov.c
index 3bddfd7..c68b151 100644 (file)
--- a/lustre/mds/mds_lov.c
+++ b/lustre/mds/mds_lov.c
@@ -846,7 +846,7 @@ int mds_revalidate_lov_ea(struct obd_device *obd, struct inode *inode,
         struct lov_stripe_md *lsm = NULL;
         struct obdo *oa;
         struct obd_trans_info oti = {0};
-        unsigned valid = 0;
+        obd_valid valid = 0;
         int lmm_size = 0, lsm_size = 0, err, rc;
         void *handle;
         ENTRY;

diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c
index 6426380..48a135e 100644 (file)
--- a/lustre/utils/obd.c
+++ b/lustre/utils/obd.c
@@ -1406,7 +1406,7 @@ int jt_obd_getattr(int argc, char **argv)
         }
         /* to help obd filter */
         data.ioc_obdo1.o_mode = 0100644;
-        data.ioc_obdo1.o_valid = 0xffffffff;
+        data.ioc_obdo1.o_valid = (obd_valid)~0ULL;
         printf("%s: object id "LPX64"\n", jt_cmdname(argv[0]),data.ioc_obdo1.o_id);
 
         IOC_PACK(argv[0], data);
@@ -1473,7 +1473,7 @@ int jt_obd_test_getattr(int argc, char **argv)
         for (i = 1, next_count = verbose; i <= count; i++) {
                 data.ioc_obdo1.o_id = objid;
                 data.ioc_obdo1.o_mode = S_IFREG;
-                data.ioc_obdo1.o_valid = 0xffffffffffffffff;
+                data.ioc_obdo1.o_valid = (obd_valid)~0ULL;
                 IOC_PACK(argv[0], data);
                 rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_GETATTR, &data);
                 shmem_bump();