b=19338

i=tom.wang, tappro

take cli->cl_dirty into accounting on osc initialization

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index a1c16a8..ec73add 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -1077,7 +1077,7 @@ static int osc_del_shrink_grant(struct client_obd *client)
 static void osc_init_grant(struct client_obd *cli, struct obd_connect_data *ocd)
 {
         client_obd_list_lock(&cli->cl_loi_list_lock);
 static void osc_init_grant(struct client_obd *cli, struct obd_connect_data *ocd)
 {
         client_obd_list_lock(&cli->cl_loi_list_lock);

-        cli->cl_avail_grant = ocd->ocd_grant;
+        cli->cl_avail_grant = ocd->ocd_grant - cli->cl_dirty;

         client_obd_list_unlock(&cli->cl_loi_list_lock);
 
         if (ocd->ocd_connect_flags & OBD_CONNECT_GRANT_SHRINK &&
         client_obd_list_unlock(&cli->cl_loi_list_lock);
 
         if (ocd->ocd_connect_flags & OBD_CONNECT_GRANT_SHRINK &&