Poisoning of all cookies at free time (to work around slab cache bug, and

also potential problems when we don't have CONFIG_DEBUG_SLAB enabled.
Rename OBD_PUNCH_EOF as OBD_OBJECT_EOF, since we use it in places other
than punch.

diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index 58f0669..b65b305 100644 (file)
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -720,7 +720,7 @@ static int filter_truncate(struct lustre_handle *conn, struct obdo *oa,
         int error;
         ENTRY;
 
-        if (end != OBD_PUNCH_EOF)
+        if (end != OBD_OBJECT_EOF)
                 CERROR("PUNCH not supported, only truncate works\n");
 
         CDEBUG(D_INODE, "calling truncate for object "LPX64", valid = %x, "

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 61adb9e..8801d81 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -626,7 +626,7 @@ static int osc_enqueue(struct lustre_handle *connh, struct lov_stripe_md *lsm,
         /* Filesystem locks are given a bit of special treatment: if
          * this is not a file size lock (which has end == -1), we
          * fixup the lock to start and end on page boundaries. */
-        if (extent->end != OBD_PUNCH_EOF) {
+        if (extent->end != OBD_OBJECT_EOF) {
                 extent->start &= PAGE_MASK;
                 extent->end = (extent->end + PAGE_SIZE - 1) & PAGE_MASK;
         }