diff -Nurwd orig/lustre-1.6.5.1/debian/changelog lustre-1.6.5.1/debian/changelog
--- orig/lustre-1.6.5.1/debian/changelog	2008-10-09 12:25:03.000000000 +0200
+++ lustre-1.6.5.1/debian/changelog	2008-10-09 14:49:36.000000000 +0200
@@ -1,3 +1,12 @@
+lustre (1.6.5.1-3) unstable; urgency=low
+
+  * [dc55182] Updated patchless support patch to do not disable
+    server support. (Closes: #501613)
+  * [444a141] Removed full-clean target, it seems to be unnecessary
+    nowadays
+
+ -- Patrick Winnertz <winnie@debian.org>  Thu, 09 Oct 2008 12:00:42 +0200
+
 lustre (1.6.5.1-2) unstable; urgency=high
 
   * Add patch from bugzilla to fix 101 Error msg. This issue
diff -Nurwd orig/lustre-1.6.5.1/debian/patches/patchless_support_2.6.24.dpatch lustre-1.6.5.1/debian/patches/patchless_support_2.6.24.dpatch
--- orig/lustre-1.6.5.1/debian/patches/patchless_support_2.6.24.dpatch	2008-10-09 12:25:03.000000000 +0200
+++ lustre-1.6.5.1/debian/patches/patchless_support_2.6.24.dpatch	2008-10-09 14:49:36.000000000 +0200
@@ -3054,7 +3054,7 @@
 +        ENTRY;
 +
 +        pgoff = ((address - vma->vm_start) >> CFS_PAGE_SHIFT) + vma->vm_pgoff;
-+        if(!ll_extent_tree_lock(vma, pgoff, &save_fags, &lockh))
++        if(!ll_get_extent_lock(vma, pgoff, &save_fags, &lockh))
 +                RETURN(NOPAGE_SIGBUS);
 +
          page = filemap_nopage(vma, address, type);
@@ -3064,7 +3064,7 @@
 -        vma->vm_flags |= (rand_read | seq_read);
  
 -        ll_extent_unlock(fd, inode, ll_i2info(inode)->lli_smd, mode, &lockh);
-+        ll_put_tree_lock(vma, save_fags, &lockh);
++        ll_put_extent_lock(vma, save_fags, &lockh);
 +
          RETURN(page);
  }
@@ -4139,6 +4139,9 @@
                  inode = iget(sb, ino);
 +#else
 +                inode = iget_locked(sb, ino);
++                if (inode && (inode->i_state & I_NEW)) {
++                  unlock_new_inode(inode);
++                }
 +#endif
          }
  
diff -Nurwd orig/lustre-1.6.5.1/debian/rules lustre-1.6.5.1/debian/rules
--- orig/lustre-1.6.5.1/debian/rules	2008-10-09 12:25:03.000000000 +0200
+++ lustre-1.6.5.1/debian/rules	2008-10-09 14:49:36.000000000 +0200
@@ -19,9 +19,6 @@
         CFLAGS += -O2
 endif
 
-# Only run full cleanup when building the source packages but for modules
-FULLCLEAN=full-clean
-
 # Module-assistant stuff
 PACKAGE=lustre-modules
 MA_DIR ?= /usr/share/modass
@@ -212,8 +209,6 @@
 	tar -chf - . --exclude='debian/$(SOURCE_PKG)/*' | \
 	 ( cd debian/$(SOURCE_PKG)/usr/src/modules/lustre && \
 	  	   tar xf - )
-	# Remove FULLCLEAN setting
-	sed -i 's/FULLCLEAN=full-clean/FULLCLEAN=/' debian/$(SOURCE_PKG)/usr/src/modules/lustre/debian/rules
 	# clean up dest
 	rm -rf debian/$(SOURCE_PKG)/usr/src/modules/lustre/debian/patched \
 	       debian/$(SOURCE_PKG)/usr/src/modules/lustre/debian/patches/* 
@@ -309,16 +304,7 @@
 	dh_clean -k -p $(PKGNAME)
 
 
-full-clean:
-	rm -f aclocal.m4 autoMakefile.in config.h.in configure
-	rm -f ldiskfs/aclocal.m4 ldiskfs/autoMakefile.in
-	rm -f ldiskfs/config.h.in ldiskfs/configure
-	find -name "autoMakefile.in" -exec rm -f -- "{}" \;
-	find -name "Makefile.in" | while read IN; do AM="$$(dirname "$$IN")/$$(basename "$$IN" .in).am"; if [ -e "$$AM" ]; then rm "$$IN"; fi; done
-	rm -rf config.sub libsysio/config.sub ldiskfs/config.sub
-	rm -rf config.guess libsysio/config.guess ldiskfs/config.guess
-
-clean: $(FULLCLEAN)
+clean:
 	dh_testdir
 	dh_testroot
 	dpatch deapply-all