[Pkg-lustre-svn-commit] updated: [d2901bf] Removed bug15587_security.capability_xattr.patch (already applied)

[Marco Nelles]

The following commit has been merged in the master branch:
commit d2901bf4e47448cc04f808fee5ad3afa553354e8
Author: Marco Nelles <marco.nelles at credativ.de>
Date:   Tue Jun 5 09:31:01 2012 +0200

    Removed bug15587_security.capability_xattr.patch (already applied)

diff --git a/debian/patches/bug15587_security.capability_xattr.patch b/debian/patches/bug15587_security.capability_xattr.patch
deleted file mode 100644
index c85823e..0000000
--- a/debian/patches/bug15587_security.capability_xattr.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-## bug15587_security.capability_xattr.dpatch by Patrick Winnertz <winnie at debian.org> 
-## DP: ignore security.capability xattr for now 
-
-Index: lustre/lustre/llite/xattr.c
-===================================================================
---- lustre.orig/lustre/llite/xattr.c	2010-12-07 16:58:57.589545003 +0100
-+++ lustre/lustre/llite/xattr.c	2010-12-07 17:00:17.853545002 +0100
-@@ -148,6 +148,11 @@
-             strcmp(name, "security.capability") == 0))
-                 RETURN(0);
- 
-+        /* b15587: ignore security.capability xattr for now */
-+        if ((xattr_type == XATTR_SECURITY_T &&
-+            strcmp(name, "security.capability") == 0))
-+                RETURN(0);
-+
-         ll_inode2fid(&fid, inode);
-         rc = mdc_setxattr(sbi->ll_mdc_exp, &fid, valid,
-                           name, value, size, 0, flags, &req);
-@@ -260,6 +265,11 @@
- 
-         /* b15587: ignore security.capability xattr for now */
-         if ((xattr_type == XATTR_SECURITY_T &&
-+            strcmp(name, "security.capability") == 0))
-+                RETURN(-ENODATA);
-+
-+        /* b15587: ignore security.capability xattr for now */
-+        if ((xattr_type == XATTR_SECURITY_T &&
-             strcmp(name, "security.capability") == 0))
-                 RETURN(-ENODATA);
- 
diff --git a/debian/patches/series b/debian/patches/series
index 8f957e0..0e76ea1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ posix-acl.patch
 no-default-debugging.patch
 no-darwin.patch
 #bug12769-ql-fix.patch
-#bug15587_security.capability_xattr.patch
 add-autogen.sh.patch
 bash-completion.patch
 #lustre_manpage.patch

-- 
Lustre Debian Packaging