Whamcloud - gitweb
LU-6303 osc: remove handling cl_avail_grant less than zero 55/23155/2
authorJames Simmons <uja.ornl@yahoo.com>
Thu, 13 Oct 2016 23:13:58 +0000 (19:13 -0400)
committerOleg Drokin <oleg.drokin@intel.com>
Tue, 25 Oct 2016 02:24:41 +0000 (02:24 +0000)
Earlier cl_avail_grant was changed to an unsigned int. Juila
Lawall reported for the upstream client the following which
affects the Intel branch as well:

drivers/staging/lustre/lustre/osc/osc_request.c:1045:5-24: WARNING: Unsigned
     expression compared with zero: cli -> cl_avail_grant < 0

Since cl_avail_grant can never be negative we can remove the
code handling the negative value case.

Change-Id: I10f7ac3aaab7ebf03a7f7ac0717b60134f09cddf
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-on: http://review.whamcloud.com/23155
Reviewed-by: Fan Yong <fan.yong@intel.com>
Tested-by: Jenkins
Reviewed-by: Frank Zago <fzago@cray.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lustre/osc/osc_request.c

index f7382ec..fb3657e 100644 (file)
@@ -922,15 +922,6 @@ static void osc_init_grant(struct client_obd *cli, struct obd_connect_data *ocd)
                                        cli->cl_dirty_pages << PAGE_SHIFT;
        }
 
-        if (cli->cl_avail_grant < 0) {
-               CWARN("%s: available grant < 0: avail/ocd/dirty %ld/%u/%ld\n",
-                     cli_name(cli), cli->cl_avail_grant,
-                     ocd->ocd_grant, cli->cl_dirty_pages << PAGE_SHIFT);
-               /* workaround for servers which do not have the patch from
-                * LU-2679 */
-               cli->cl_avail_grant = ocd->ocd_grant;
-        }
-
        if (OCD_HAS_FLAG(ocd, GRANT_PARAM)) {
                u64 size;
                int chunk_mask;