Branch HEAD

b=15308

Back the previous mistake commit.

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 0f91e70..fc3ab33 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -1462,10 +1462,7 @@ int ll_setattr_raw(struct inode *inode, struct iattr *attr)
         /* NB: ATTR_SIZE will only be set after this point if the size
          * resides on the MDS, ie, this file has no objects. */
         if (lsm)
-        {
-                printk("LSM mode, unset the ATTR_SIZE\n" );
                 attr->ia_valid &= ~ATTR_SIZE;
-        }
 
         /* We always do an MDS RPC, even if we're only changing the size;
          * only the MDS knows whether truncate() should fail with -ETXTBUSY */
@@ -1551,7 +1548,6 @@ int ll_setattr(struct dentry *de, struct iattr *attr)
 {
         int mode;
 
-printk("ia_valid=%x\n", attr->ia_valid );
         if ((attr->ia_valid & (ATTR_CTIME|ATTR_SIZE|ATTR_MODE)) ==
             (ATTR_CTIME|ATTR_SIZE|ATTR_MODE))
                 attr->ia_valid |= MDS_OPEN_OWNEROVERRIDE;

diff --git a/lustre/mdd/mdd_object.c b/lustre/mdd/mdd_object.c
index 68b831d..c9b9d3e 100644 (file)
--- a/lustre/mdd/mdd_object.c
+++ b/lustre/mdd/mdd_object.c
@@ -737,10 +737,7 @@ static int mdd_fix_attr(const struct lu_env *env, struct mdd_object *obj,
                 if ((la->la_valid & ~LA_MODE) &&
                     (uc->mu_fsuid != tmp_la->la_uid) &&
                     !mdd_capable(uc, CAP_FOWNER))
-                    {
-                        printk("valid=%x, fsuid=%o, la_uid=%o\n", la->la_valid, uc->mu_fsuid, tmp_la->la_uid );
                         RETURN(-EPERM);
-                    }
 
                 if (la->la_mode == (umode_t) -1)
                         la->la_mode = tmp_la->la_mode;

diff --git a/lustre/mdt/mdt_lib.c b/lustre/mdt/mdt_lib.c
index 6583bc4..aca644c 100644 (file)
--- a/lustre/mdt/mdt_lib.c
+++ b/lustre/mdt/mdt_lib.c
@@ -683,7 +683,6 @@ static __u64 mdt_attr_valid_xlate(__u64 in, struct mdt_reint_record *rr,
         if (in & MDS_OPEN_OWNEROVERRIDE)
                 ma->ma_attr_flags |= MDS_OPEN_OWNEROVERRIDE;
 
-                printk("in=%x,out=%x\n", in, out );
         /*XXX need ATTR_RAW?*/
         in &= ~(ATTR_MODE|ATTR_UID|ATTR_GID|ATTR_SIZE|ATTR_BLOCKS|
                 ATTR_ATIME|ATTR_MTIME|ATTR_CTIME|ATTR_FROM_OPEN|