LU-13810 tests: increase limit for 1g

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

diff --git a/lustre/llite/pcc.c b/lustre/llite/pcc.c
index 9b00644..cfad000 100644 (file)
--- a/lustre/llite/pcc.c
+++ b/lustre/llite/pcc.c
@@ -1443,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;
 
@@ -1473,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));
@@ -1498,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;
 
@@ -1513,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;
@@ -1736,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;
@@ -1758,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);
@@ -1797,36 +1793,34 @@ out:
        RETURN(rc);
 }
 
+#ifdef HAVE_DEFAULT_FILE_SPLICE_READ_EXPORT
 ssize_t pcc_file_splice_read(struct file *in_file, loff_t *ppos,
                             struct pipe_inode_info *pipe,
-                            size_t count, unsigned int flags,
-                            bool *cached)
+                            size_t count, unsigned int flags)
 {
        struct inode *inode = file_inode(in_file);
        struct ll_file_data *fd = in_file->private_data;
        struct file *pcc_file = fd->fd_pcc_file.pccf_file;
+       bool cached = false;
        ssize_t result;
 
        ENTRY;
 
-       *cached = false;
-       if (!pcc_file)
-               RETURN(0);
-
-       if (!file_inode(pcc_file)->i_fop->splice_read)
-               RETURN(-ENOTSUPP);
+       if (!pcc_file) {
+               RETURN(default_file_splice_read(in_file, ppos, pipe,
+                      count, flags));
+       }
 
-       pcc_io_init(inode, PIT_SPLICE_READ, cached);
-       if (!*cached)
+       pcc_io_init(inode, PIT_SPLICE_READ, &cached);
+       if (!cached)
                RETURN(0);
 
-       result = file_inode(pcc_file)->i_fop->splice_read(pcc_file,
-                                                         ppos, pipe, count,
-                                                         flags);
+       result = default_file_splice_read(pcc_file, ppos, pipe, count, flags);
 
        pcc_io_fini(inode);
        RETURN(result);
 }
+#endif /* HAVE_DEFAULT_FILE_SPLICE_READ_EXPORT */
 
 int pcc_fsync(struct file *file, loff_t start, loff_t end,
              int datasync, bool *cached)
@@ -2091,9 +2085,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;
 }
@@ -2327,9 +2320,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);