LU-12137 llite: use ->iterate_shared() for readdir

[fs/lustre-release.git] / lustre / osd-ldiskfs / osd_handler.c

diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c
index 0b6a85c..185e3d3 100644 (file)
--- a/lustre/osd-ldiskfs/osd_handler.c
+++ b/lustre/osd-ldiskfs/osd_handler.c
@@ -495,13 +495,13 @@ int osd_ldiskfs_add_entry(struct osd_thread_info *info, struct osd_device *osd,
                }
 
                if (fid != NULL)
-                       CWARN("%s: directory (inode: %lu, FID: "DFID") %s "
-                             "maximum entry limit\n",
+                       /* below message is checked in sanity.sh test_129 */
+                       CWARN("%s: directory (inode: %lu, FID: "DFID") %s maximum entry limit\n",
                              osd_name(osd), parent->i_ino, PFID(fid),
                              rc == -ENOSPC ? "has reached" : "is approaching");
                else
-                       CWARN("%s: directory (inode: %lu, FID: unknown) %s "
-                             "maximum entry limit\n",
+                       /* below message is checked in sanity.sh test_129 */
+                       CWARN("%s: directory (inode: %lu, FID: unknown) %s maximum entry limit\n",
                              osd_name(osd), parent->i_ino,
                              rc == -ENOSPC ? "has reached" : "is approaching");
 
@@ -1023,11 +1023,7 @@ again:
                oclb.oclb_items = 0;
 #ifdef HAVE_DIR_CONTEXT
                oclb.ctx.pos = filp->f_pos;
-#ifdef HAVE_ITERATE_SHARED
                rc = fops->iterate_shared(filp, &oclb.ctx);
-#else
-               rc = fops->iterate(filp, &oclb.ctx);
-#endif
                filp->f_pos = oclb.ctx.pos;
 #else
                rc = fops->readdir(filp, &oclb, osd_stripe_dir_filldir);
@@ -1883,7 +1879,7 @@ static int osd_trans_start(const struct lu_env *env, struct dt_device *d,
                 */
                if (last_credits != oh->ot_credits &&
                    time_after(jiffies, last_printed +
-                              msecs_to_jiffies(60 * MSEC_PER_SEC)) &&
+                              cfs_time_seconds(60)) &&
                    osd_transaction_size(dev) > 512) {
                        CWARN("%s: credits %u > trans_max %u\n", osd_name(dev),
                              oh->ot_credits, osd_transaction_size(dev));
@@ -2215,7 +2211,7 @@ int osd_statfs(const struct lu_env *env, struct dt_device *d,
                goto out;
 
        statfs_pack(sfs, ksfs);
-       if (unlikely(sb->s_flags & MS_RDONLY))
+       if (unlikely(sb->s_flags & SB_RDONLY))
                sfs->os_state |= OS_STATE_READONLY;
 
        sfs->os_state |= osd->od_nonrotational ? OS_STATE_NONROT : 0;
@@ -2319,8 +2315,8 @@ static void osd_conf_get(const struct lu_env *env,
 #endif
                param->ddp_max_ea_size = sb->s_blocksize - ea_overhead;
 
-       if (param->ddp_max_ea_size > OBD_MAX_EA_SIZE - ea_overhead)
-               param->ddp_max_ea_size = OBD_MAX_EA_SIZE - ea_overhead;
+       if (param->ddp_max_ea_size > OBD_MAX_EA_SIZE)
+               param->ddp_max_ea_size = OBD_MAX_EA_SIZE;
 
        /*
         * Preferred RPC size for efficient disk IO.  4MB shows good
@@ -2943,7 +2939,7 @@ static int osd_quota_transfer(struct inode *inode, const struct lu_attr *attr)
            (attr->la_valid & LA_GID && attr->la_gid != i_gid_read(inode))) {
                struct iattr iattr;
 
-               ll_vfs_dq_init(inode);
+               dquot_initialize(inode);
                iattr.ia_valid = 0;
                if (attr->la_valid & LA_UID)
                        iattr.ia_valid |= ATTR_UID;
@@ -2952,7 +2948,7 @@ static int osd_quota_transfer(struct inode *inode, const struct lu_attr *attr)
                iattr.ia_uid = make_kuid(&init_user_ns, attr->la_uid);
                iattr.ia_gid = make_kgid(&init_user_ns, attr->la_gid);
 
-               rc = ll_vfs_dq_transfer(inode, &iattr);
+               rc = dquot_transfer(inode, &iattr);
                if (rc) {
                        CERROR("%s: quota transfer failed: rc = %d. Is quota "
                               "enforcement enabled on the ldiskfs "
@@ -4437,7 +4433,7 @@ static int osd_xattr_set_pfid(const struct lu_env *env, struct osd_object *obj,
                        RETURN(fl);
 
                /* Remove old PFID EA entry firstly. */
-               ll_vfs_dq_init(inode);
+               dquot_initialize(inode);
                rc = osd_removexattr(dentry, inode, XATTR_NAME_FID);
                if (rc == -ENODATA) {
                        if ((fl & LU_XATTR_REPLACE) && !(fl & LU_XATTR_CREATE))
@@ -4741,7 +4737,7 @@ static int osd_xattr_del(const struct lu_env *env, struct dt_object *dt,
                                obj->oo_pfid_in_lma = 0;
                }
        } else {
-               ll_vfs_dq_init(inode);
+               dquot_initialize(inode);
                dentry->d_inode = inode;
                dentry->d_sb = inode->i_sb;
                rc = osd_removexattr(dentry, inode, name);
@@ -5192,7 +5188,7 @@ static int osd_index_ea_delete(const struct lu_env *env, struct dt_object *dt,
        LASSERT(oh->ot_handle != NULL);
        LASSERT(oh->ot_handle->h_transaction != NULL);
 
-       ll_vfs_dq_init(dir);
+       dquot_initialize(dir);
        dentry = osd_child_dentry_get(env, obj,
                                      (char *)key, strlen((char *)key));
 
@@ -5427,7 +5423,7 @@ static int __osd_ea_add_rec(struct osd_thread_info *info,
                osd_get_ldiskfs_dirent_param(ldp, fid);
        child = osd_child_dentry_get(info->oti_env, pobj, name, strlen(name));
        child->d_fsdata = (void *)ldp;
-       ll_vfs_dq_init(pobj->oo_inode);
+       dquot_initialize(pobj->oo_inode);
        rc = osd_ldiskfs_add_entry(info, osd_obj2dev(pobj), oth->ot_handle,
                                   child, cinode, hlock);
        if (rc == 0 && OBD_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_TYPE)) {
@@ -6631,11 +6627,7 @@ static int osd_ldiskfs_it_fill(const struct lu_env *env,
 
 #ifdef HAVE_DIR_CONTEXT
        buf.ctx.pos = filp->f_pos;
-#ifdef HAVE_ITERATE_SHARED
        rc = inode->i_fop->iterate_shared(filp, &buf.ctx);
-#else
-       rc = inode->i_fop->iterate(filp, &buf.ctx);
-#endif
        filp->f_pos = buf.ctx.pos;
 #else
        rc = inode->i_fop->readdir(filp, &buf, osd_ldiskfs_filldir);
@@ -6794,7 +6786,7 @@ osd_dirent_reinsert(const struct lu_env *env, struct osd_device *dev,
        ldp = (struct ldiskfs_dentry_param *)osd_oti_get(env)->oti_ldp;
        osd_get_ldiskfs_dirent_param(ldp, fid);
        dentry->d_fsdata = (void *)ldp;
-       ll_vfs_dq_init(dir);
+       dquot_initialize(dir);
        rc = osd_ldiskfs_add_entry(info, dev, jh, dentry, inode, hlock);
        /*
         * It is too bad, we cannot reinsert the name entry back.
@@ -8147,7 +8139,7 @@ static int osd_health_check(const struct lu_env *env, struct obd_device *obd)
        struct osd_device *osd = osd_dev(obd->obd_lu_dev);
        struct super_block *sb = osd_sb(osd);
 
-       return (osd->od_mnt == NULL || sb->s_flags & MS_RDONLY);
+       return (osd->od_mnt == NULL || sb->s_flags & SB_RDONLY);
 }
 
 /*