- unset smfs flags on PENDING dir and 'O' dir on OSS.

- set smfs flags on group subdirs

diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index 7751d20..8b2793a 100644 (file)
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -703,6 +703,11 @@ static int filter_read_group_internal(struct obd_device *obd, int group,
                                        group, dir, rc);
                                 GOTO(cleanup, rc);
                         }
+
+                        /* turn on smfs plugins if any */
+                        fsfilt_set_fs_flags(obd, tmp_subdirs->dentry[i]->d_inode,
+                                            SM_ALL_PLG);
+
                         CDEBUG(D_INODE, "got/created O/%d/%s: %p\n", group, dir,
                                tmp_subdirs->dentry[i]);
                 }

diff --git a/lustre/smfs/smfs_lib.c b/lustre/smfs/smfs_lib.c
index 0e63db9..468e7ec 100644 (file)
--- a/lustre/smfs/smfs_lib.c
+++ b/lustre/smfs/smfs_lib.c
@@ -173,7 +173,7 @@ static void smfs_filter_flags(struct filter_obd * filt, struct inode * o_dir)
         
         CDEBUG(D_SUPER,"OST OBD post_setup\n");
         /* enable plugins for all in O */
-        SMFS_SET(I2SMI(o_dir)->smi_flags, SMFS_PLG_ALL);
+        /* SMFS_SET(I2SMI(o_dir)->smi_flags, SMFS_PLG_ALL); */
         /* enable plugins for all already created d<n> dirs */
         for (j = 1; j < filt->fo_group_count; j++) {
                 for (i = 0; i < filt->fo_subdir_count; i++) {
@@ -194,7 +194,7 @@ static void smfs_mds_flags(struct mds_obd *mds, struct inode *root)
         SMFS_SET(I2SMI(root)->smi_flags, SMFS_PLG_ALL);
 
         /* the same for PENDING */
-        SMFS_SET(I2SMI(pend)->smi_flags, SMFS_PLG_ALL);
+        /* SMFS_SET(I2SMI(pend)->smi_flags, SMFS_PLG_ALL); */
 }
 
 extern int (*audit_id2name_superhack) (struct obd_device *obd, char **name,