LU-12931 gnilnd: use time_after() to compare jiffies

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

diff --git a/lustre/llite/pcc.c b/lustre/llite/pcc.c
index f5e4cae..eeae234 100644 (file)
--- a/lustre/llite/pcc.c
+++ b/lustre/llite/pcc.c
@@ -214,13 +214,13 @@ pcc_fname_list_add(struct cfs_lstr *id, struct list_head *fname_list)
 {
        struct pcc_match_fname *fname;
 
-       OBD_ALLOC(fname, sizeof(struct pcc_match_fname));
+       OBD_ALLOC_PTR(fname);
        if (fname == NULL)
                return -ENOMEM;
 
        OBD_ALLOC(fname->pmf_name, id->ls_len + 1);
        if (fname->pmf_name == NULL) {
-               OBD_FREE(fname, sizeof(struct pcc_match_fname));
+               OBD_FREE_PTR(fname);
                return -ENOMEM;
        }
 
@@ -313,7 +313,7 @@ pcc_expression_parse(struct cfs_lstr *src, struct list_head *cond_list)
        struct cfs_lstr field;
        int rc = 0;
 
-       OBD_ALLOC(expr, sizeof(struct pcc_expression));
+       OBD_ALLOC_PTR(expr);
        if (expr == NULL)
                return -ENOMEM;
 
@@ -371,7 +371,7 @@ pcc_conjunction_parse(struct cfs_lstr *src, struct list_head *cond_list)
        struct cfs_lstr expr;
        int rc = 0;
 
-       OBD_ALLOC(conjunction, sizeof(struct pcc_conjunction));
+       OBD_ALLOC_PTR(conjunction);
        if (conjunction == NULL)
                return -ENOMEM;
 
@@ -1456,7 +1456,7 @@ int pcc_file_open(struct inode *inode, struct file *file)
 {
        struct pcc_inode *pcci;
        struct ll_inode_info *lli = ll_i2info(inode);
-       struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
+       struct ll_file_data *fd = file->private_data;
        struct pcc_file *pccf = &fd->fd_pcc_file;
        struct file *pcc_file;
        struct path *path;
@@ -1494,13 +1494,8 @@ int pcc_file_open(struct inode *inode, struct file *file)
        CDEBUG(D_CACHE, "opening pcc file '%.*s'\n", dname->len,
               dname->name);
 
-#ifdef HAVE_DENTRY_OPEN_USE_PATH
        pcc_file = dentry_open(path, file->f_flags,
                               pcc_super_cred(inode->i_sb));
-#else
-       pcc_file = dentry_open(path->dentry, path->mnt, file->f_flags,
-                              pcc_super_cred(inode->i_sb));
-#endif
        if (IS_ERR_OR_NULL(pcc_file)) {
                rc = pcc_file == NULL ? -EINVAL : PTR_ERR(pcc_file);
                pcc_inode_put(pcci);
@@ -1517,7 +1512,7 @@ out_unlock:
 void pcc_file_release(struct inode *inode, struct file *file)
 {
        struct pcc_inode *pcci;
-       struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
+       struct ll_file_data *fd = file->private_data;
        struct pcc_file *pccf;
        struct path *path;
        struct qstr *dname;
@@ -1619,7 +1614,7 @@ ssize_t pcc_file_read_iter(struct kiocb *iocb,
                           struct iov_iter *iter, bool *cached)
 {
        struct file *file = iocb->ki_filp;
-       struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
+       struct ll_file_data *fd = file->private_data;
        struct pcc_file *pccf = &fd->fd_pcc_file;
        struct inode *inode = file_inode(file);
        ssize_t result;
@@ -1686,7 +1681,7 @@ ssize_t pcc_file_write_iter(struct kiocb *iocb,
                            struct iov_iter *iter, bool *cached)
 {
        struct file *file = iocb->ki_filp;
-       struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
+       struct ll_file_data *fd = file->private_data;
        struct pcc_file *pccf = &fd->fd_pcc_file;
        struct inode *inode = file_inode(file);
        ssize_t result;
@@ -1786,11 +1781,10 @@ int pcc_inode_getattr(struct inode *inode, bool *cached)
                GOTO(out, rc);
 
        ll_inode_size_lock(inode);
-       if (inode->i_atime.tv_sec < lli->lli_atime ||
-           lli->lli_update_atime) {
+       if (ll_file_test_and_clear_flag(lli, LLIF_UPDATE_ATIME) ||
+           inode->i_atime.tv_sec < lli->lli_atime)
                inode->i_atime.tv_sec = lli->lli_atime;
-               lli->lli_update_atime = 0;
-       }
+
        inode->i_mtime.tv_sec = lli->lli_mtime;
        inode->i_ctime.tv_sec = lli->lli_ctime;
 
@@ -1826,7 +1820,7 @@ ssize_t pcc_file_splice_read(struct file *in_file, loff_t *ppos,
                             bool *cached)
 {
        struct inode *inode = file_inode(in_file);
-       struct ll_file_data *fd = LUSTRE_FPRIVATE(in_file);
+       struct ll_file_data *fd = in_file->private_data;
        struct file *pcc_file = fd->fd_pcc_file.pccf_file;
        ssize_t result;
 
@@ -1855,7 +1849,7 @@ int pcc_fsync(struct file *file, loff_t start, loff_t end,
              int datasync, bool *cached)
 {
        struct inode *inode = file_inode(file);
-       struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
+       struct ll_file_data *fd = file->private_data;
        struct file *pcc_file = fd->fd_pcc_file.pccf_file;
        int rc;
 
@@ -1881,7 +1875,7 @@ int pcc_file_mmap(struct file *file, struct vm_area_struct *vma,
                  bool *cached)
 {
        struct inode *inode = file_inode(file);
-       struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
+       struct ll_file_data *fd = file->private_data;
        struct file *pcc_file = fd->fd_pcc_file.pccf_file;
        struct pcc_inode *pcci;
        int rc = 0;
@@ -1916,7 +1910,7 @@ void pcc_vm_open(struct vm_area_struct *vma)
        struct pcc_inode *pcci;
        struct file *file = vma->vm_file;
        struct inode *inode = file_inode(file);
-       struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
+       struct ll_file_data *fd = file->private_data;
        struct file *pcc_file = fd->fd_pcc_file.pccf_file;
        struct vm_operations_struct *pcc_vm_ops = vma->vm_private_data;
 
@@ -1940,7 +1934,7 @@ void pcc_vm_close(struct vm_area_struct *vma)
 {
        struct file *file = vma->vm_file;
        struct inode *inode = file_inode(file);
-       struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
+       struct ll_file_data *fd = file->private_data;
        struct file *pcc_file = fd->fd_pcc_file.pccf_file;
        struct vm_operations_struct *pcc_vm_ops = vma->vm_private_data;
 
@@ -1965,7 +1959,7 @@ int pcc_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
        struct mm_struct *mm = vma->vm_mm;
        struct file *file = vma->vm_file;
        struct inode *inode = file_inode(file);
-       struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
+       struct ll_file_data *fd = file->private_data;
        struct file *pcc_file = fd->fd_pcc_file.pccf_file;
        struct vm_operations_struct *pcc_vm_ops = vma->vm_private_data;
        int rc;
@@ -2045,7 +2039,7 @@ int pcc_fault(struct vm_area_struct *vma, struct vm_fault *vmf,
 {
        struct file *file = vma->vm_file;
        struct inode *inode = file_inode(file);
-       struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
+       struct ll_file_data *fd = file->private_data;
        struct file *pcc_file = fd->fd_pcc_file.pccf_file;
        struct vm_operations_struct *pcc_vm_ops = vma->vm_private_data;
        int rc;
@@ -2075,13 +2069,12 @@ int pcc_fault(struct vm_area_struct *vma, struct vm_fault *vmf,
 
 static void pcc_layout_wait(struct pcc_inode *pcci)
 {
-       struct l_wait_info lwi = { 0 };
 
        while (atomic_read(&pcci->pcci_active_ios) > 0) {
                CDEBUG(D_CACHE, "Waiting for IO completion: %d\n",
                       atomic_read(&pcci->pcci_active_ios));
-               l_wait_event(pcci->pcci_waitq,
-                            atomic_read(&pcci->pcci_active_ios) == 0, &lwi);
+               wait_event_idle(pcci->pcci_waitq,
+                               atomic_read(&pcci->pcci_active_ios) == 0);
        }
 }
 
@@ -2199,7 +2192,7 @@ pcc_create(struct dentry *base, const char *name, umode_t mode)
        if (d_is_positive(dentry))
                goto out;
 
-       rc = vfs_create(dir, dentry, mode, LL_VFS_CREATE_FALSE);
+       rc = vfs_create(dir, dentry, mode, false);
        if (rc) {
                dput(dentry);
                dentry = ERR_PTR(rc);
@@ -2474,12 +2467,7 @@ int pcc_readwrite_attach(struct file *file, struct inode *inode,
 
        path.mnt = dataset->pccd_path.mnt;
        path.dentry = dentry;
-#ifdef HAVE_DENTRY_OPEN_USE_PATH
        pcc_filp = dentry_open(&path, O_WRONLY | O_LARGEFILE, current_cred());
-#else
-       pcc_filp = dentry_open(path.dentry, path.mnt, O_WRONLY | O_LARGEFILE,
-                              current_cred());
-#endif
        if (IS_ERR_OR_NULL(pcc_filp)) {
                rc = pcc_filp == NULL ? -EINVAL : PTR_ERR(pcc_filp);
                GOTO(out_dentry, rc);
@@ -2682,7 +2670,7 @@ int pcc_ioctl_state(struct file *file, struct inode *inode,
        char *buf;
        char *path;
        int buf_len = sizeof(state->pccs_path);
-       struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
+       struct ll_file_data *fd = file->private_data;
        struct pcc_file *pccf = &fd->fd_pcc_file;
        struct pcc_inode *pcci;