branch: b_release_1_4_6

 - superblock need MS_POSIXACL flag
 - check_acl() should return -EAGAIN in case of no ACL present or not
   support ACL, to allow fall back triditional UGO checking.

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 669c367..cdaca99 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -1612,7 +1612,7 @@ int lustre_check_acl(struct inode *inode, int mask)
 
         RETURN(rc);
 #else
-        return 0;
+        return -EAGAIN;
 #endif
 }
 

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index d8d0414..ca727bb 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -198,9 +198,12 @@ int lustre_common_fill_super(struct super_block *sb, char *mdc, char *osc)
                 sbi->ll_flags &= ~LL_SBI_USER_XATTR;
         }
 
-        if (data->ocd_connect_flags & OBD_CONNECT_ACL)
+        if (data->ocd_connect_flags & OBD_CONNECT_ACL) {
+#ifdef MS_POSIXACL
+                sb->s_flags |= MS_POSIXACL;
+#endif
                 sbi->ll_flags |= LL_SBI_ACL;
-        else
+        } else
                 sbi->ll_flags &= ~LL_SBI_ACL;
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))