[Pkg-lustre-svn-commit] updated: [df329e4] Add bug15587_security.capability_xattr.dpatch to disable security.capability xattr

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit df329e47ed931c839324f8bdbf28a3a0bd29c63f
Author: Patrick Winnertz <winnie at debian.org>
Date:   Wed Jun 2 11:38:15 2010 +0200

    Add bug15587_security.capability_xattr.dpatch
    to disable security.capability xattr
    
    Signed-off-by: Patrick Winnertz <winnie at debian.org>

diff --git a/debian/patches/00list b/debian/patches/00list
index eec7022..311d5b5 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -8,6 +8,7 @@ autogen.sh.dpatch
 no-darwin.dpatch
 libsysio.dpatch
 bug12769-ql-fix.dpatch
+bug15587_security.capability_xattr.dpatch
 # Debian patches
 bash_completion.dpatch
 lustre_manpage.dpatch
diff --git a/debian/patches/bug15587_security.capability_xattr.dpatch b/debian/patches/bug15587_security.capability_xattr.dpatch
new file mode 100755
index 0000000..212c991
--- /dev/null
+++ b/debian/patches/bug15587_security.capability_xattr.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bug15587_security.capability_xattr.dpatch by Patrick Winnertz <winnie at debian.org> 
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: ignore security.capability xattr for now 
+
+ at DPATCH@
+diff --git a/lustre/llite/xattr.c b/lustre/llite/xattr.c
+index 8fbc7bf..819e7bb 100644
+--- a/lustre/llite/xattr.c
++++ b/lustre/llite/xattr.c
+@@ -142,6 +142,11 @@ int ll_setxattr_common(struct inode *inode, const char *name,
+             (xattr_type == XATTR_LUSTRE_T && strcmp(name, "lustre.lov") == 0))
+                 RETURN(0);
+ 
++        /* b15587: ignore security.capability xattr for now */
++        if ((xattr_type == XATTR_SECURUTY_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);
+@@ -254,6 +259,11 @@ int ll_getxattr_common(struct inode *inode, const char *name,
+         if (rc)
+                 RETURN(rc);
+ 
++        /* b15587: ignore security.capability xattr for now */
++        if ((xattr_type == XATTR_SECURUTY_T &&
++            strcmp(name, "security.capability") == 0))
++                RETURN(-ENODATA);
++
+         /* posix acl is under protection of LOOKUP lock. when calling to this,
+          * we just have path resolution to the target inode, so we have great
+          * chance that cached ACL is uptodate.

-- 
Lustre Debian Packaging