LU-7261 ldiskfs: fix large_xattr overwrite

[fs/lustre-release.git] / lustre / quota / lproc_quota.c

diff --git a/lustre/quota/lproc_quota.c b/lustre/quota/lproc_quota.c
index 791f47d..3b3e648 100644 (file)
--- a/lustre/quota/lproc_quota.c
+++ b/lustre/quota/lproc_quota.c
@@ -36,7 +36,7 @@
 #include <linux/seq_file.h>
 #include "lquota_internal.h"
 
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
 /* structure allocated at seq_open time and release when seq_release is called.
  * It is passed to seq_start/stop/next/show which can thus use the same lu_env
  * to be used with the iterator API */
@@ -66,7 +66,7 @@ static void *lprocfs_quota_seq_start(struct seq_file *p, loff_t *pos)
 
        /* initialize iterator */
        iops = &lqp->lqp_obj->do_index_ops->dio_it;
-       it = iops->init(&lqp->lqp_env, lqp->lqp_obj, 0, BYPASS_CAPA);
+       it = iops->init(&lqp->lqp_env, lqp->lqp_obj, 0);
        if (IS_ERR(it)) {
                CERROR("%s: failed to initialize iterator: rc = %ld\n",
                       lqp->lqp_obj->do_lu.lo_dev->ld_obd->obd_name,
@@ -253,7 +253,6 @@ struct seq_operations lprocfs_quota_seq_sops = {
 
 static int lprocfs_quota_seq_open(struct inode *inode, struct file *file)
 {
-       struct proc_dir_entry   *dp = PDE(inode);
        struct seq_file         *seq;
        int                      rc;
        struct lquota_procfs    *lqp;
@@ -265,7 +264,7 @@ static int lprocfs_quota_seq_open(struct inode *inode, struct file *file)
                return -ENOMEM;
 
        /* store pointer to object we would like to iterate over */
-       lqp->lqp_obj = (struct dt_object *)dp->data;
+       lqp->lqp_obj = (struct dt_object *)PDE_DATA(inode);
 
        /* Initialize the common environment to be used in the seq operations */
        rc = lu_env_init(&lqp->lqp_env, LCT_LOCAL);
@@ -280,10 +279,9 @@ static int lprocfs_quota_seq_open(struct inode *inode, struct file *file)
                goto out_lqp;
        }
 
-       if (LPROCFS_ENTRY_CHECK(dp)) {
-               rc = -ENOENT;
+       rc = LPROCFS_ENTRY_CHECK(inode);
+       if (rc < 0)
                goto out_env;
-       }
 
        rc = seq_open(file, &lprocfs_quota_seq_sops);
        if (rc)
@@ -319,4 +317,4 @@ struct file_operations lprocfs_quota_seq_fops = {
        .llseek         = seq_lseek,
        .release        = lprocfs_quota_seq_release,
 };
-#endif  /* LPROCFS */
+#endif /* CONFIG_PROC_FS */