Merge b1_4_smallfix from b1_4 (20041012_1142)

- fix NULL dereference in /proc/sys/portals/routes (4827)
- stop precreate on OST before MDS would time out on it (4778)
- don't free dentries not owned by NFS code, check generation (4806)
- don't send truncate RPC if file size isn't changing (4410)

diff --git a/lustre/lov/lov_qos.c b/lustre/lov/lov_qos.c
index a2b1643..0f6f012 100644 (file)
--- a/lustre/lov/lov_qos.c
+++ b/lustre/lov/lov_qos.c
@@ -40,12 +40,12 @@ void qos_shrink_lsm(struct lov_request_set *set)
         struct lov_stripe_md *lsm_new;
         /* XXX LOV STACKING call into osc for sizes */
         unsigned oldsize, newsize;
-        
+
         if (set->set_oti && set->set_cookies && set->set_cookie_sent) {
                 struct llog_cookie *cookies;
                 oldsize = lsm->lsm_stripe_count * sizeof(*cookies);
                 newsize = set->set_count * sizeof(*cookies);
-                
+
                 cookies = set->set_cookies;
                 oti_alloc_cookies(set->set_oti, set->set_count);
                 if (set->set_oti->oti_logcookies) {
@@ -56,10 +56,10 @@ void qos_shrink_lsm(struct lov_request_set *set)
                         CWARN("'leaking' %d bytes\n", oldsize - newsize);
                 }
         }
-        
+
         CWARN("using fewer stripes for object "LPX64": old %u new %u\n",
               lsm->lsm_object_id, lsm->lsm_stripe_count, set->set_count);
-        
+
         oldsize = lov_stripe_md_size(lsm->lsm_stripe_count);
         newsize = lov_stripe_md_size(set->set_count);
         OBD_ALLOC(lsm_new, newsize);

diff --git a/lustre/lov/lov_request.c b/lustre/lov/lov_request.c
index eb34640..e4ae796 100644 (file)
--- a/lustre/lov/lov_request.c
+++ b/lustre/lov/lov_request.c
@@ -724,7 +724,8 @@ static int common_attr_done(struct lov_request_set *set)
         tmp_oa->o_id = set->set_oa->o_id;
         memcpy(set->set_oa, tmp_oa, sizeof(*set->set_oa));
 out:
-        obdo_free(tmp_oa);
+        if (tmp_oa)
+                obdo_free(tmp_oa);
         RETURN(rc);
 
 }