Branch b1_8

lfs lacks quota support if building with confiugre --disable-modules
b=16481
i=shadow
i=rread

diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c
index 273b6f3..b0419f3 100644 (file)
--- a/lustre/ost/ost_handler.c
+++ b/lustre/ost/ost_handler.c
@@ -1360,6 +1360,7 @@ static int ost_get_info(struct obd_export *exp, struct ptlrpc_request *req)
         RETURN(rc);
 }
 
+#ifdef HAVE_QUOTA_SUPPORT
 static int ost_handle_quotactl(struct ptlrpc_request *req)
 {
         struct obd_quotactl *oqctl, *repoqc;
@@ -1426,6 +1427,7 @@ static int ost_handle_quota_adjust_qunit(struct ptlrpc_request *req)
  out:
         RETURN(rc);
 }
+#endif
 
 static int ost_filter_recovery_request(struct ptlrpc_request *req,
                                        struct obd_device *obd, int *process)
@@ -1483,6 +1485,7 @@ int ost_msg_check_version(struct lustre_msg *msg)
         case OST_SYNC:
         case OST_SET_INFO:
         case OST_GET_INFO:
+#ifdef HAVE_QUOTA_SUPPORT
         case OST_QUOTACHECK:
         case OST_QUOTACTL:
         case OST_QUOTA_ADJUST_QUNIT:
@@ -1493,6 +1496,7 @@ int ost_msg_check_version(struct lustre_msg *msg)
                                lustre_msg_get_version(msg),
                                LUSTRE_OST_VERSION);
                 break;
+#endif
         case LDLM_ENQUEUE:
         case LDLM_CONVERT:
         case LDLM_CANCEL:
@@ -1663,6 +1667,7 @@ static int ost_handle(struct ptlrpc_request *req)
                 DEBUG_REQ(D_INODE, req, "get_info");
                 rc = ost_get_info(req->rq_export, req);
                 break;
+#ifdef HAVE_QUOTA_SUPPORT
         case OST_QUOTACHECK:
                 CDEBUG(D_INODE, "quotacheck\n");
                 OBD_FAIL_RETURN(OBD_FAIL_OST_QUOTACHECK_NET, 0);
@@ -1677,6 +1682,7 @@ static int ost_handle(struct ptlrpc_request *req)
                 CDEBUG(D_INODE, "quota_adjust_qunit\n");
                 rc = ost_handle_quota_adjust_qunit(req);
                 break;
+#endif
         case OBD_PING:
                 DEBUG_REQ(D_INODE, req, "ping");
                 rc = target_handle_ping(req);