Update b_eq from HEAD (20040213_1644) (b_bug974 landing).

Eric Mei, per your comment in osc_announce_cached(), we should only be sending
OBD_MD_FLGRANT if the client is caching data.  If (AFAIK) liblustre isn't
doing any client-side write cache then it shouldn't be requesting any grant
from the OST.  This isn't critical, since the OST _should_ stop giving out
grant when the client isn't consuming it, but it would be good to verify.

diff --git a/lustre/lov/lproc_lov.c b/lustre/lov/lproc_lov.c
index 2a322e6..c29644c 100644 (file)
--- a/lustre/lov/lproc_lov.c
+++ b/lustre/lov/lproc_lov.c
@@ -187,6 +187,7 @@ struct lprocfs_vars lprocfs_obd_vars[] = {
         { "blocksize",    lprocfs_rd_blksize,     0, 0 },
         { "kbytestotal",  lprocfs_rd_kbytestotal, 0, 0 },
         { "kbytesfree",   lprocfs_rd_kbytesfree,  0, 0 },
+        { "kbytesavail",  lprocfs_rd_kbytesavail, 0, 0 },
         { "desc_uuid",    lov_rd_desc_uuid,       0, 0 },
         { 0 }
 };

diff --git a/lustre/mds/lproc_mds.c b/lustre/mds/lproc_mds.c
index 59b3401..10365a6 100644 (file)
--- a/lustre/mds/lproc_mds.c
+++ b/lustre/mds/lproc_mds.c
@@ -158,6 +158,7 @@ struct lprocfs_vars lprocfs_mds_obd_vars[] = {
         { "blocksize",    lprocfs_rd_blksize,     0, 0 },
         { "kbytestotal",  lprocfs_rd_kbytestotal, 0, 0 },
         { "kbytesfree",   lprocfs_rd_kbytesfree,  0, 0 },
+        { "kbytesavail",  lprocfs_rd_kbytesavail, 0, 0 },
         { "fstype",       lprocfs_rd_fstype,      0, 0 },
         { "filestotal",   lprocfs_rd_filestotal,  0, 0 },
         { "filesfree",    lprocfs_rd_filesfree,   0, 0 },