LU-13733 llite: report client stats sumsq

[fs/lustre-release.git] / lustre / llite / pcc.c

diff --git a/lustre/llite/pcc.c b/lustre/llite/pcc.c
index eeae234..b80173e 100644 (file)
--- a/lustre/llite/pcc.c
+++ b/lustre/llite/pcc.c
@@ -1106,16 +1106,9 @@ static int pcc_layout_xattr_set(struct pcc_inode *pcci, __u32 gen)
        if (!(lli->lli_pcc_dsflags & PCC_DATASET_AUTO_ATTACH))
                RETURN(0);
 
-#ifndef HAVE_VFS_SETXATTR
-       if (!pcc_dentry->d_inode->i_op->setxattr)
-               RETURN(-ENOTSUPP);
+       rc = ll_vfs_setxattr(pcc_dentry, pcc_dentry->d_inode, pcc_xattr_layout,
+                            &gen, sizeof(gen), 0);
 
-       rc = pcc_dentry->d_inode->i_op->setxattr(pcc_dentry, pcc_xattr_layout,
-                                                &gen, sizeof(gen), 0);
-#else
-       rc = __vfs_setxattr(pcc_dentry, pcc_dentry->d_inode, pcc_xattr_layout,
-                           &gen, sizeof(gen), 0);
-#endif
        RETURN(rc);
 }
 
@@ -1238,18 +1231,8 @@ static int pcc_try_dataset_attach(struct inode *inode, __u32 gen,
                GOTO(out, rc = 0);
 
        pcc_dentry = path.dentry;
-#ifndef HAVE_VFS_SETXATTR
-       if (!pcc_dentry->d_inode->i_op->getxattr)
-               /* ignore this error */
-               GOTO(out_put_path, rc = 0);
-
-       rc = pcc_dentry->d_inode->i_op->getxattr(pcc_dentry, pcc_xattr_layout,
-                                                &pcc_gen, sizeof(pcc_gen));
-#else
-       rc = __vfs_getxattr(pcc_dentry, pcc_dentry->d_inode, pcc_xattr_layout,
-                           &pcc_gen, sizeof(pcc_gen));
-#endif
-
+       rc = ll_vfs_getxattr(pcc_dentry, pcc_dentry->d_inode, pcc_xattr_layout,
+                            &pcc_gen, sizeof(pcc_gen));
        if (rc < 0)
                /* ignore this error */
                GOTO(out_put_path, rc = 0);
@@ -1460,7 +1443,6 @@ int pcc_file_open(struct inode *inode, struct file *file)
        struct pcc_file *pccf = &fd->fd_pcc_file;
        struct file *pcc_file;
        struct path *path;
-       struct qstr *dname;
        bool cached = false;
        int rc = 0;
 
@@ -1490,9 +1472,7 @@ int pcc_file_open(struct inode *inode, struct file *file)
        WARN_ON(pccf->pccf_file);
 
        path = &pcci->pcci_path;
-       dname = &path->dentry->d_name;
-       CDEBUG(D_CACHE, "opening pcc file '%.*s'\n", dname->len,
-              dname->name);
+       CDEBUG(D_CACHE, "opening pcc file '%pd'\n", path->dentry);
 
        pcc_file = dentry_open(path, file->f_flags,
                               pcc_super_cred(inode->i_sb));
@@ -1515,7 +1495,6 @@ void pcc_file_release(struct inode *inode, struct file *file)
        struct ll_file_data *fd = file->private_data;
        struct pcc_file *pccf;
        struct path *path;
-       struct qstr *dname;
 
        ENTRY;
 
@@ -1530,9 +1509,7 @@ void pcc_file_release(struct inode *inode, struct file *file)
        pcci = ll_i2pcci(inode);
        LASSERT(pcci);
        path = &pcci->pcci_path;
-       dname = &path->dentry->d_name;
-       CDEBUG(D_CACHE, "releasing pcc file \"%.*s\"\n", dname->len,
-              dname->name);
+       CDEBUG(D_CACHE, "releasing pcc file \"%pd\"\n", path->dentry);
        pcc_inode_put(pcci);
        fput(pccf->pccf_file);
        pccf->pccf_file = NULL;
@@ -1753,7 +1730,8 @@ int pcc_inode_setattr(struct inode *inode, struct iattr *attr,
        RETURN(rc);
 }
 
-int pcc_inode_getattr(struct inode *inode, bool *cached)
+int pcc_inode_getattr(struct inode *inode, u32 request_mask,
+                     unsigned int flags, bool *cached)
 {
        struct ll_inode_info *lli = ll_i2info(inode);
        const struct cred *old_cred;
@@ -1775,7 +1753,8 @@ int pcc_inode_getattr(struct inode *inode, bool *cached)
                RETURN(0);
 
        old_cred = override_creds(pcc_super_cred(inode->i_sb));
-       rc = ll_vfs_getattr(&ll_i2pcci(inode)->pcci_path, &stat);
+       rc = ll_vfs_getattr(&ll_i2pcci(inode)->pcci_path, &stat, request_mask,
+                           flags);
        revert_creds(old_cred);
        if (rc)
                GOTO(out, rc);
@@ -2067,22 +2046,17 @@ int pcc_fault(struct vm_area_struct *vma, struct vm_fault *vmf,
        RETURN(rc);
 }
 
-static void pcc_layout_wait(struct pcc_inode *pcci)
-{
-
-       while (atomic_read(&pcci->pcci_active_ios) > 0) {
-               CDEBUG(D_CACHE, "Waiting for IO completion: %d\n",
-                      atomic_read(&pcci->pcci_active_ios));
-               wait_event_idle(pcci->pcci_waitq,
-                               atomic_read(&pcci->pcci_active_ios) == 0);
-       }
-}
-
 static void __pcc_layout_invalidate(struct pcc_inode *pcci)
 {
        pcci->pcci_type = LU_PCC_NONE;
        pcc_layout_gen_set(pcci, CL_LAYOUT_GEN_NONE);
-       pcc_layout_wait(pcci);
+       if (atomic_read(&pcci->pcci_active_ios) == 0)
+               return;
+
+       CDEBUG(D_CACHE, "Waiting for IO completion: %d\n",
+                      atomic_read(&pcci->pcci_active_ios));
+       wait_event_idle(pcci->pcci_waitq,
+                       atomic_read(&pcci->pcci_active_ios) == 0);
 }
 
 void pcc_layout_invalidate(struct inode *inode)
@@ -2113,9 +2087,8 @@ static int pcc_inode_remove(struct inode *inode, struct dentry *pcc_dentry)
 
        rc = ll_vfs_unlink(pcc_dentry->d_parent->d_inode, pcc_dentry);
        if (rc)
-               CWARN("%s: failed to unlink PCC file %.*s, rc = %d\n",
-                     ll_i2sbi(inode)->ll_fsname, pcc_dentry->d_name.len,
-                     pcc_dentry->d_name.name, rc);
+               CWARN("%s: failed to unlink PCC file %pd, rc = %d\n",
+                     ll_i2sbi(inode)->ll_fsname, pcc_dentry, rc);
 
        return rc;
 }
@@ -2349,9 +2322,8 @@ void pcc_create_attach_cleanup(struct super_block *sb,
                rc = ll_vfs_unlink(pca->pca_dentry->d_parent->d_inode,
                                   pca->pca_dentry);
                if (rc)
-                       CWARN("failed to unlink PCC file %.*s, rc = %d\n",
-                             pca->pca_dentry->d_name.len,
-                             pca->pca_dentry->d_name.name, rc);
+                       CWARN("%s: failed to unlink PCC file %pd: rc = %d\n",
+                             ll_s2sbi(sb)->ll_fsname, pca->pca_dentry, rc);
                /* ignore the unlink failure */
                revert_creds(old_cred);
                dput(pca->pca_dentry);