[Pkg-lustre-svn-commit] updated: [24df931] Adapted lines on posix-acl.patch

[Marco Nelles]

The following commit has been merged in the master branch:
commit 24df931b4c36c67ee0a915c99171d29361057b64
Author: Marco Nelles <marco.nelles at credativ.de>
Date:   Mon Jun 4 16:47:42 2012 +0200

    Adapted lines on posix-acl.patch

diff --git a/debian/patches/posix-acl.patch b/debian/patches/posix-acl.patch
new file mode 100644
index 0000000..aed0328
--- /dev/null
+++ b/debian/patches/posix-acl.patch
@@ -0,0 +1,73 @@
+## posix_acl.patch by Goswin von Brederlow <goswin-v-b at web.de>
+## DP: Patch from Q-Leap Networks
+
+diff --git a/debian/patches/series b/debian/patches/series
+index 5b5de74..5e09c49 100644
+--- a/debian/patches/series
++++ b/debian/patches/series
+@@ -1,4 +1,4 @@
+-#posix_acl.patch
++posix-acl.patch
+ #ldiskfs-detect-2.6.20-2.6.22.patch
+ #no_default_debugging.patch
+ no-darwin.patch
+diff --git a/lustre/llite/file.c b/lustre/llite/file.c
+index 231f2f3..717724a 100644
+--- a/lustre/llite/file.c
++++ b/lustre/llite/file.c
+@@ -47,6 +47,7 @@
+ #include <lustre_lite.h>
+ #include <linux/pagemap.h>
+ #include <linux/file.h>
++#include <linux/posix_acl.h>
+ #include "llite_internal.h"
+ #include <lustre/ll_fiemap.h>
+ 
+diff --git a/lustre/llite/xattr.c b/lustre/llite/xattr.c
+index cb1a2f0..1879b84 100644
+--- a/lustre/llite/xattr.c
++++ b/lustre/llite/xattr.c
+@@ -40,6 +40,7 @@
+ #include <linux/sched.h>
+ #include <linux/mm.h>
+ #include <linux/smp_lock.h>
++#include <linux/posix_acl_xattr.h>
+ 
+ #define DEBUG_SUBSYSTEM S_LLITE
+ 
+diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
+index 759c3f5..14f0136 100644
+--- a/lustre/mdc/mdc_locks.c
++++ b/lustre/mdc/mdc_locks.c
+@@ -46,6 +46,7 @@
+ # include <linux/pagemap.h>
+ # include <linux/miscdevice.h>
+ # include <linux/init.h>
++# include <linux/posix_acl_xattr.h>
+ #else
+ # include <liblustre.h>
+ #endif
+diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
+index 524738b..c7017f2 100644
+--- a/lustre/mdc/mdc_request.c
++++ b/lustre/mdc/mdc_request.c
+@@ -46,6 +46,7 @@
+ # include <linux/pagemap.h>
+ # include <linux/miscdevice.h>
+ # include <linux/init.h>
++# include <linux/posix_acl_xattr.h>
+ #else
+ # include <liblustre.h>
+ #endif
+diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c
+index 35af1a9..47fdd54 100644
+--- a/lustre/mds/handler.c
++++ b/lustre/mds/handler.c
+@@ -48,6 +48,7 @@
+ #include <linux/init.h>
+ #include <linux/fs.h>
+ #include <linux/jbd.h>
++#include <linux/posix_acl_xattr.h>
+ #include <linux/smp_lock.h>
+ #include <linux/buffer_head.h>
+ #include <linux/workqueue.h>
diff --git a/debian/patches/posix_acl.patch b/debian/patches/posix_acl.patch
deleted file mode 100644
index 1cbaeeb..0000000
--- a/debian/patches/posix_acl.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-## posix_acl.patch by Goswin von Brederlow <goswin-v-b at web.de>
-## DP: Patch from Q-Leap Networks
-
-Index: lustre/lustre/llite/file.c
-===================================================================
---- lustre.orig/lustre/llite/file.c	2010-12-07 16:54:33.281545003 +0100
-+++ lustre/lustre/llite/file.c	2010-12-07 16:58:57.589545003 +0100
-@@ -45,6 +45,7 @@
- #include <lustre_lite.h>
- #include <linux/pagemap.h>
- #include <linux/file.h>
-+#include <linux/posix_acl.h>
- #include "llite_internal.h"
- #include <lustre/ll_fiemap.h>
- 
-Index: lustre/lustre/llite/xattr.c
-===================================================================
---- lustre.orig/lustre/llite/xattr.c	2010-12-07 16:54:33.273545003 +0100
-+++ lustre/lustre/llite/xattr.c	2010-12-07 16:58:57.589545003 +0100
-@@ -38,6 +38,7 @@
- #include <linux/sched.h>
- #include <linux/mm.h>
- #include <linux/smp_lock.h>
-+#include <linux/posix_acl_xattr.h>
- 
- #define DEBUG_SUBSYSTEM S_LLITE
- 
-Index: lustre/lustre/mdc/mdc_locks.c
-===================================================================
---- lustre.orig/lustre/mdc/mdc_locks.c	2010-12-07 16:54:33.249545003 +0100
-+++ lustre/lustre/mdc/mdc_locks.c	2010-12-07 16:58:57.589545003 +0100
-@@ -44,6 +44,7 @@
- # include <linux/pagemap.h>
- # include <linux/miscdevice.h>
- # include <linux/init.h>
-+# include <linux/posix_acl_xattr.h>
- #else
- # include <liblustre.h>
- #endif
-Index: lustre/lustre/mdc/mdc_request.c
-===================================================================
---- lustre.orig/lustre/mdc/mdc_request.c	2010-12-07 16:54:33.253545003 +0100
-+++ lustre/lustre/mdc/mdc_request.c	2010-12-07 16:58:57.593545003 +0100
-@@ -44,6 +44,7 @@
- # include <linux/pagemap.h>
- # include <linux/miscdevice.h>
- # include <linux/init.h>
-+# include <linux/posix_acl_xattr.h>
- #else
- # include <liblustre.h>
- #endif
-Index: lustre/lustre/mds/handler.c
-===================================================================
---- lustre.orig/lustre/mds/handler.c	2010-12-07 16:54:33.265545003 +0100
-+++ lustre/lustre/mds/handler.c	2010-12-07 16:58:57.593545003 +0100
-@@ -52,6 +52,7 @@
- #include <linux/random.h>
- #include <linux/fs.h>
- #include <linux/jbd.h>
-+#include <linux/posix_acl_xattr.h>
- # include <linux/smp_lock.h>
- # include <linux/buffer_head.h>
- # include <linux/workqueue.h>
diff --git a/debian/patches/series b/debian/patches/series
index 5b5de74..5e09c49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-#posix_acl.patch
+posix-acl.patch
 #ldiskfs-detect-2.6.20-2.6.22.patch
 #no_default_debugging.patch
 no-darwin.patch

-- 
Lustre Debian Packaging