Branch b1_6

b=13358
i=wangdi
i=nikita

Impossible (EPROTO is returned) to access a directory that has a
non-default striping and ACLs.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 04f281c..6a89ad0 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -57,6 +57,12 @@ Details    : Don't take the BKL in fsfilt_ext3_setattr() for 2.6 kernels.
             It causes scheduling issues when removing large files (17TB in the
             present case).
 
+Severity   : normal
+Bugzilla   : 13358
+Description: 1.4.11 Can't handle directories with stripe set and extended acls
+Details    : Impossible (EPROTO is returned) to access a directory that has a
+            non-default striping and ACLs.
+
 --------------------------------------------------------------------------------
 
 2007-09-27         Cluster File Systems, Inc. <info@clusterfs.com>

diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
index f73c236..e38ac4d 100644 (file)
--- a/lustre/mdc/mdc_request.c
+++ b/lustre/mdc/mdc_request.c
@@ -447,6 +447,11 @@ int mdc_req2lustre_md(struct ptlrpc_request *req, int offset,
                 offset++;
         }
 
+        if (md->body->valid & OBD_MD_FLDIREA) {
+                LASSERT(S_ISDIR(md->body->mode));
+                offset++;
+        }
+
         /* for ACL, it's possible that FLACL is set but aclsize is zero.
          * only when aclsize != 0 there's an actual segment for ACL in
          * reply buffer.