LU-15217 pcc: disable PCC for encrypted files

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

diff --git a/lustre/llite/pcc.c b/lustre/llite/pcc.c
index cfad000..ab451c4 100644 (file)
--- a/lustre/llite/pcc.c
+++ b/lustre/llite/pcc.c
@@ -1060,15 +1060,15 @@ void pcc_inode_free(struct inode *inode)
 #define MAX_PCC_DATABASE_PATH (6 * 5 + FID_NOBRACE_LEN + 1)
 static int pcc_fid2dataset_path(char *buf, int sz, struct lu_fid *fid)
 {
-       return snprintf(buf, sz, "%04x/%04x/%04x/%04x/%04x/%04x/"
-                       DFID_NOBRACE,
-                       (fid)->f_oid       & 0xFFFF,
-                       (fid)->f_oid >> 16 & 0xFFFF,
-                       (unsigned int)((fid)->f_seq       & 0xFFFF),
-                       (unsigned int)((fid)->f_seq >> 16 & 0xFFFF),
-                       (unsigned int)((fid)->f_seq >> 32 & 0xFFFF),
-                       (unsigned int)((fid)->f_seq >> 48 & 0xFFFF),
-                       PFID(fid));
+       return scnprintf(buf, sz, "%04x/%04x/%04x/%04x/%04x/%04x/"
+                        DFID_NOBRACE,
+                        (fid)->f_oid       & 0xFFFF,
+                        (fid)->f_oid >> 16 & 0xFFFF,
+                        (unsigned int)((fid)->f_seq       & 0xFFFF),
+                        (unsigned int)((fid)->f_seq >> 16 & 0xFFFF),
+                        (unsigned int)((fid)->f_seq >> 32 & 0xFFFF),
+                        (unsigned int)((fid)->f_seq >> 48 & 0xFFFF),
+                        PFID(fid));
 }
 
 static inline const struct cred *pcc_super_cred(struct super_block *sb)
@@ -1129,27 +1129,27 @@ static int pcc_get_layout_info(struct inode *inode, struct cl_layout *clt)
                RETURN(PTR_ERR(env));
 
        rc = cl_object_layout_get(env, lli->lli_clob, clt);
-       if (rc)
+       if (rc < 0)
                CDEBUG(D_INODE, "Cannot get layout for "DFID"\n",
                       PFID(ll_inode2fid(inode)));
 
        cl_env_put(env, &refcheck);
-       RETURN(rc);
+       RETURN(rc < 0 ? rc : 0);
 }
 
 static int pcc_fid2dataset_fullpath(char *buf, int sz, struct lu_fid *fid,
                                    struct pcc_dataset *dataset)
 {
-       return snprintf(buf, sz, "%s/%04x/%04x/%04x/%04x/%04x/%04x/"
-                       DFID_NOBRACE,
-                       dataset->pccd_pathname,
-                       (fid)->f_oid       & 0xFFFF,
-                       (fid)->f_oid >> 16 & 0xFFFF,
-                       (unsigned int)((fid)->f_seq       & 0xFFFF),
-                       (unsigned int)((fid)->f_seq >> 16 & 0xFFFF),
-                       (unsigned int)((fid)->f_seq >> 32 & 0xFFFF),
-                       (unsigned int)((fid)->f_seq >> 48 & 0xFFFF),
-                       PFID(fid));
+       return scnprintf(buf, sz, "%s/%04x/%04x/%04x/%04x/%04x/%04x/"
+                        DFID_NOBRACE,
+                        dataset->pccd_pathname,
+                        (fid)->f_oid       & 0xFFFF,
+                        (fid)->f_oid >> 16 & 0xFFFF,
+                        (unsigned int)((fid)->f_seq       & 0xFFFF),
+                        (unsigned int)((fid)->f_seq >> 16 & 0xFFFF),
+                        (unsigned int)((fid)->f_seq >> 32 & 0xFFFF),
+                        (unsigned int)((fid)->f_seq >> 48 & 0xFFFF),
+                        PFID(fid));
 }
 
 /* Must be called with pcci->pcci_lock held */
@@ -1451,6 +1451,9 @@ int pcc_file_open(struct inode *inode, struct file *file)
        if (!S_ISREG(inode->i_mode))
                RETURN(0);
 
+       if (IS_ENCRYPTED(inode))
+               RETURN(0);
+
        pcc_inode_lock(inode);
        pcci = ll_i2pcci(inode);
 
@@ -1548,7 +1551,7 @@ static void pcc_io_fini(struct inode *inode)
 
        LASSERT(pcci && atomic_read(&pcci->pcci_active_ios) > 0);
        if (atomic_dec_and_test(&pcci->pcci_active_ios))
-               wake_up_all(&pcci->pcci_waitq);
+               wake_up(&pcci->pcci_waitq);
 }
 
 
@@ -1760,7 +1763,7 @@ int pcc_inode_getattr(struct inode *inode, u32 request_mask,
                GOTO(out, rc);
 
        ll_inode_size_lock(inode);
-       if (ll_file_test_and_clear_flag(lli, LLIF_UPDATE_ATIME) ||
+       if (test_and_clear_bit(LLIF_UPDATE_ATIME, &lli->lli_flags) ||
            inode->i_atime.tv_sec < lli->lli_atime)
                inode->i_atime.tv_sec = lli->lli_atime;
 
@@ -1806,14 +1809,14 @@ ssize_t pcc_file_splice_read(struct file *in_file, loff_t *ppos,
 
        ENTRY;
 
-       if (!pcc_file) {
+       if (!pcc_file)
                RETURN(default_file_splice_read(in_file, ppos, pipe,
-                      count, flags));
-       }
+                                               count, flags));
 
        pcc_io_init(inode, PIT_SPLICE_READ, &cached);
        if (!cached)
-               RETURN(0);
+               RETURN(default_file_splice_read(in_file, ppos, pipe,
+                                               count, flags));
 
        result = default_file_splice_read(pcc_file, ppos, pipe, count, flags);
 
@@ -1954,7 +1957,7 @@ int pcc_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
                       "%s: PCC backend fs not support ->page_mkwrite()\n",
                       ll_i2sbi(inode)->ll_fsname);
                pcc_ioctl_detach(inode, PCC_DETACH_OPT_UNCACHE);
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                *cached = true;
                RETURN(VM_FAULT_RETRY | VM_FAULT_NOPAGE);
        }
@@ -1981,7 +1984,7 @@ int pcc_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
                 */
                if (page->mapping == pcc_file->f_mapping) {
                        *cached = true;
-                       up_read(&mm->mmap_sem);
+                       mmap_read_unlock(mm);
                        RETURN(VM_FAULT_RETRY | VM_FAULT_NOPAGE);
                }
 
@@ -1995,7 +1998,7 @@ int pcc_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
        if (OBD_FAIL_CHECK(OBD_FAIL_LLITE_PCC_DETACH_MKWRITE)) {
                pcc_io_fini(inode);
                pcc_ioctl_detach(inode, PCC_DETACH_OPT_UNCACHE);
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                RETURN(VM_FAULT_RETRY | VM_FAULT_NOPAGE);
        }