LU-1710 lvb: variable sized LVB support

[fs/lustre-release.git] / lustre / liblustre / super.c

diff --git a/lustre/liblustre/super.c b/lustre/liblustre/super.c
index 81808cb..7511fa0 100644 (file)
--- a/lustre/liblustre/super.c
+++ b/lustre/liblustre/super.c
@@ -1346,8 +1346,9 @@ static int llu_file_flock(struct inode *ino,
                         RETURN(rc = -ENODEV);
 
                 if (lmv->tgts[0].ltd_exp != NULL)
-                        rc = ldlm_cli_enqueue(lmv->tgts[0].ltd_exp, NULL, &einfo, &res_id,
-                                              &flock, &flags, NULL, 0, &lockh, 0);
+                       rc = ldlm_cli_enqueue(lmv->tgts[0].ltd_exp, NULL,
+                                             &einfo, &res_id, &flock, &flags,
+                                             NULL, 0, LVB_T_NONE, &lockh, 0);
                 else
                         rc = -ENODEV;
         }
@@ -1924,7 +1925,8 @@ llu_fsswop_mount(const char *source,
 
         ocd.ocd_connect_flags = OBD_CONNECT_IBITS | OBD_CONNECT_VERSION |
                                 OBD_CONNECT_FID | OBD_CONNECT_AT |
-                                OBD_CONNECT_VBR | OBD_CONNECT_FULL20;
+                               OBD_CONNECT_VBR | OBD_CONNECT_FULL20 |
+                               OBD_CONNECT_LVB_TYPE;
 
 #ifdef LIBLUSTRE_POSIX_ACL
         ocd.ocd_connect_flags |= OBD_CONNECT_ACL;
@@ -1962,7 +1964,8 @@ llu_fsswop_mount(const char *source,
         ocd.ocd_connect_flags = OBD_CONNECT_SRVLOCK | OBD_CONNECT_REQPORTAL |
                                 OBD_CONNECT_VERSION | OBD_CONNECT_TRUNCLOCK |
                                 OBD_CONNECT_FID | OBD_CONNECT_AT |
-                                OBD_CONNECT_FULL20 | OBD_CONNECT_EINPROGRESS;
+                               OBD_CONNECT_FULL20 | OBD_CONNECT_EINPROGRESS |
+                               OBD_CONNECT_LVB_TYPE;
 
         ocd.ocd_version = LUSTRE_VERSION_CODE;
         err = obd_connect(NULL, &sbi->ll_dt_exp, obd, &sbi->ll_sb_uuid, &ocd, NULL);