Skip to content

Commit ac0c493

Browse files
torvaldstorvalds
committed
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull UDF and quota updates from Jan Kara: "A few UDF fixes and also a few patches which are preparing filesystems for support of project quotas in VFS" * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: udf: Fix loading of special inodes ocfs2: Back out change to use OCFS2_MAXQUOTAS in ocfs2_setattr() udf: remove redundant sys_tz declaration ocfs2: Don't use MAXQUOTAS value reiserfs: Don't use MAXQUOTAS value ext3: Don't use MAXQUOTAS value udf: Fix race between write(2) and close(2)
2 parents eca9fdf + 6174c2e commit ac0c493

File tree

14 files changed

+101
-68
lines changed

14 files changed

+101
-68
lines changed

‎fs/ext3/ext3.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,8 @@ struct ext3_new_group_data {
237237
#define EXT3_IOC32_GETVERSION_OLD FS_IOC32_GETVERSION
238238
#define EXT3_IOC32_SETVERSION_OLD FS_IOC32_SETVERSION
239239

240+
/* Number of supported quota types */
241+
#define EXT3_MAXQUOTAS 2
240242

241243
/*
242244
* Mount options
@@ -248,7 +250,7 @@ struct ext3_mount_options {
248250
unsigned long s_commit_interval;
249251
#ifdef CONFIG_QUOTA
250252
int s_jquota_fmt;
251-
char *s_qf_names[MAXQUOTAS];
253+
char *s_qf_names[EXT3_MAXQUOTAS];
252254
#endif
253255
};
254256

@@ -669,7 +671,7 @@ struct ext3_sb_info {
669671
unsigned long s_commit_interval;
670672
struct block_device *journal_bdev;
671673
#ifdef CONFIG_QUOTA
672-
char *s_qf_names[MAXQUOTAS]; /* Names of quota files with journalled quota */
674+
char *s_qf_names[EXT3_MAXQUOTAS]; /* Names of quota files with journalled quota */
673675
int s_jquota_fmt; /* Format of quota to use */
674676
#endif
675677
};
@@ -1183,9 +1185,9 @@ extern const struct inode_operations ext3_fast_symlink_inode_operations;
11831185
#define EXT3_QUOTA_INIT_BLOCKS(sb) 0
11841186
#define EXT3_QUOTA_DEL_BLOCKS(sb) 0
11851187
#endif
1186-
#define EXT3_MAXQUOTAS_TRANS_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_TRANS_BLOCKS(sb))
1187-
#define EXT3_MAXQUOTAS_INIT_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_INIT_BLOCKS(sb))
1188-
#define EXT3_MAXQUOTAS_DEL_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_DEL_BLOCKS(sb))
1188+
#define EXT3_MAXQUOTAS_TRANS_BLOCKS(sb) (EXT3_MAXQUOTAS*EXT3_QUOTA_TRANS_BLOCKS(sb))
1189+
#define EXT3_MAXQUOTAS_INIT_BLOCKS(sb) (EXT3_MAXQUOTAS*EXT3_QUOTA_INIT_BLOCKS(sb))
1190+
#define EXT3_MAXQUOTAS_DEL_BLOCKS(sb) (EXT3_MAXQUOTAS*EXT3_QUOTA_DEL_BLOCKS(sb))
11891191

11901192
int
11911193
ext3_mark_iloc_dirty(handle_t *handle,

‎fs/ext3/super.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ static void ext3_put_super (struct super_block * sb)
441441
percpu_counter_destroy(&sbi->s_dirs_counter);
442442
brelse(sbi->s_sbh);
443443
#ifdef CONFIG_QUOTA
444-
for (i = 0; i < MAXQUOTAS; i++)
444+
for (i = 0; i < EXT3_MAXQUOTAS; i++)
445445
kfree(sbi->s_qf_names[i]);
446446
#endif
447447

@@ -1555,7 +1555,7 @@ static void ext3_orphan_cleanup (struct super_block * sb,
15551555
/* Needed for iput() to work correctly and not trash data */
15561556
sb->s_flags |= MS_ACTIVE;
15571557
/* Turn on quotas so that they are updated correctly */
1558-
for (i = 0; i < MAXQUOTAS; i++) {
1558+
for (i = 0; i < EXT3_MAXQUOTAS; i++) {
15591559
if (EXT3_SB(sb)->s_qf_names[i]) {
15601560
int ret = ext3_quota_on_mount(sb, i);
15611561
if (ret < 0)
@@ -1606,7 +1606,7 @@ static void ext3_orphan_cleanup (struct super_block * sb,
16061606
PLURAL(nr_truncates));
16071607
#ifdef CONFIG_QUOTA
16081608
/* Turn quotas off */
1609-
for (i = 0; i < MAXQUOTAS; i++) {
1609+
for (i = 0; i < EXT3_MAXQUOTAS; i++) {
16101610
if (sb_dqopt(sb)->files[i])
16111611
dquot_quota_off(sb, i);
16121612
}
@@ -2139,7 +2139,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
21392139
kfree(sbi->s_group_desc);
21402140
failed_mount:
21412141
#ifdef CONFIG_QUOTA
2142-
for (i = 0; i < MAXQUOTAS; i++)
2142+
for (i = 0; i < EXT3_MAXQUOTAS; i++)
21432143
kfree(sbi->s_qf_names[i]);
21442144
#endif
21452145
ext3_blkdev_remove(sbi);
@@ -2659,7 +2659,7 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
26592659
old_opts.s_commit_interval = sbi->s_commit_interval;
26602660
#ifdef CONFIG_QUOTA
26612661
old_opts.s_jquota_fmt = sbi->s_jquota_fmt;
2662-
for (i = 0; i < MAXQUOTAS; i++)
2662+
for (i = 0; i < EXT3_MAXQUOTAS; i++)
26632663
if (sbi->s_qf_names[i]) {
26642664
old_opts.s_qf_names[i] = kstrdup(sbi->s_qf_names[i],
26652665
GFP_KERNEL);
@@ -2763,7 +2763,7 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
27632763
}
27642764
#ifdef CONFIG_QUOTA
27652765
/* Release old quota file names */
2766-
for (i = 0; i < MAXQUOTAS; i++)
2766+
for (i = 0; i < EXT3_MAXQUOTAS; i++)
27672767
kfree(old_opts.s_qf_names[i]);
27682768
#endif
27692769
if (enable_quota)
@@ -2777,7 +2777,7 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
27772777
sbi->s_commit_interval = old_opts.s_commit_interval;
27782778
#ifdef CONFIG_QUOTA
27792779
sbi->s_jquota_fmt = old_opts.s_jquota_fmt;
2780-
for (i = 0; i < MAXQUOTAS; i++) {
2780+
for (i = 0; i < EXT3_MAXQUOTAS; i++) {
27812781
kfree(sbi->s_qf_names[i]);
27822782
sbi->s_qf_names[i] = old_opts.s_qf_names[i];
27832783
}

‎fs/ocfs2/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1252,7 +1252,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
12521252
brelse(bh);
12531253

12541254
/* Release quota pointers in case we acquired them */
1255-
for (qtype = 0; qtype < MAXQUOTAS; qtype++)
1255+
for (qtype = 0; qtype < OCFS2_MAXQUOTAS; qtype++)
12561256
dqput(transfer_to[qtype]);
12571257

12581258
if (!status && attr->ia_valid & ATTR_MODE) {

‎fs/ocfs2/quota.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717

1818
#include "ocfs2.h"
1919

20+
/* Number of quota types we support */
21+
#define OCFS2_MAXQUOTAS 2
22+
2023
/*
2124
* In-memory structures
2225
*/
@@ -39,7 +42,7 @@ struct ocfs2_recovery_chunk {
3942
};
4043

4144
struct ocfs2_quota_recovery {
42-
struct list_head r_list[MAXQUOTAS]; /* List of chunks to recover */
45+
struct list_head r_list[OCFS2_MAXQUOTAS]; /* List of chunks to recover */
4346
};
4447

4548
/* In-memory structure with quota header information */

‎fs/ocfs2/quota_global.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,8 @@ void ocfs2_unlock_global_qf(struct ocfs2_mem_dqinfo *oinfo, int ex)
336336
int ocfs2_global_read_info(struct super_block *sb, int type)
337337
{
338338
struct inode *gqinode = NULL;
339-
unsigned int ino[MAXQUOTAS] = { USER_QUOTA_SYSTEM_INODE,
340-
GROUP_QUOTA_SYSTEM_INODE };
339+
unsigned int ino[OCFS2_MAXQUOTAS] = { USER_QUOTA_SYSTEM_INODE,
340+
GROUP_QUOTA_SYSTEM_INODE };
341341
struct ocfs2_global_disk_dqinfo dinfo;
342342
struct mem_dqinfo *info = sb_dqinfo(sb, type);
343343
struct ocfs2_mem_dqinfo *oinfo = info->dqi_priv;

‎fs/ocfs2/quota_local.c

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,12 @@ static int ocfs2_read_quota_block(struct inode *inode, u64 v_block,
166166
/* Check whether we understand format of quota files */
167167
static int ocfs2_local_check_quota_file(struct super_block *sb, int type)
168168
{
169-
unsigned int lmagics[MAXQUOTAS] = OCFS2_LOCAL_QMAGICS;
170-
unsigned int lversions[MAXQUOTAS] = OCFS2_LOCAL_QVERSIONS;
171-
unsigned int gmagics[MAXQUOTAS] = OCFS2_GLOBAL_QMAGICS;
172-
unsigned int gversions[MAXQUOTAS] = OCFS2_GLOBAL_QVERSIONS;
173-
unsigned int ino[MAXQUOTAS] = { USER_QUOTA_SYSTEM_INODE,
174-
GROUP_QUOTA_SYSTEM_INODE };
169+
unsigned int lmagics[OCFS2_MAXQUOTAS] = OCFS2_LOCAL_QMAGICS;
170+
unsigned int lversions[OCFS2_MAXQUOTAS] = OCFS2_LOCAL_QVERSIONS;
171+
unsigned int gmagics[OCFS2_MAXQUOTAS] = OCFS2_GLOBAL_QMAGICS;
172+
unsigned int gversions[OCFS2_MAXQUOTAS] = OCFS2_GLOBAL_QVERSIONS;
173+
unsigned int ino[OCFS2_MAXQUOTAS] = { USER_QUOTA_SYSTEM_INODE,
174+
GROUP_QUOTA_SYSTEM_INODE };
175175
struct buffer_head *bh = NULL;
176176
struct inode *linode = sb_dqopt(sb)->files[type];
177177
struct inode *ginode = NULL;
@@ -336,7 +336,7 @@ void ocfs2_free_quota_recovery(struct ocfs2_quota_recovery *rec)
336336
{
337337
int type;
338338

339-
for (type = 0; type < MAXQUOTAS; type++)
339+
for (type = 0; type < OCFS2_MAXQUOTAS; type++)
340340
free_recovery_list(&(rec->r_list[type]));
341341
kfree(rec);
342342
}
@@ -382,7 +382,7 @@ static struct ocfs2_quota_recovery *ocfs2_alloc_quota_recovery(void)
382382
rec = kmalloc(sizeof(struct ocfs2_quota_recovery), GFP_NOFS);
383383
if (!rec)
384384
return NULL;
385-
for (type = 0; type < MAXQUOTAS; type++)
385+
for (type = 0; type < OCFS2_MAXQUOTAS; type++)
386386
INIT_LIST_HEAD(&(rec->r_list[type]));
387387
return rec;
388388
}
@@ -392,10 +392,11 @@ struct ocfs2_quota_recovery *ocfs2_begin_quota_recovery(
392392
struct ocfs2_super *osb,
393393
int slot_num)
394394
{
395-
unsigned int feature[MAXQUOTAS] = { OCFS2_FEATURE_RO_COMPAT_USRQUOTA,
396-
OCFS2_FEATURE_RO_COMPAT_GRPQUOTA};
397-
unsigned int ino[MAXQUOTAS] = { LOCAL_USER_QUOTA_SYSTEM_INODE,
398-
LOCAL_GROUP_QUOTA_SYSTEM_INODE };
395+
unsigned int feature[OCFS2_MAXQUOTAS] = {
396+
OCFS2_FEATURE_RO_COMPAT_USRQUOTA,
397+
OCFS2_FEATURE_RO_COMPAT_GRPQUOTA};
398+
unsigned int ino[OCFS2_MAXQUOTAS] = { LOCAL_USER_QUOTA_SYSTEM_INODE,
399+
LOCAL_GROUP_QUOTA_SYSTEM_INODE };
399400
struct super_block *sb = osb->sb;
400401
struct ocfs2_local_disk_dqinfo *ldinfo;
401402
struct inode *lqinode;
@@ -412,7 +413,7 @@ struct ocfs2_quota_recovery *ocfs2_begin_quota_recovery(
412413
return ERR_PTR(-ENOMEM);
413414
/* First init... */
414415

415-
for (type = 0; type < MAXQUOTAS; type++) {
416+
for (type = 0; type < OCFS2_MAXQUOTAS; type++) {
416417
if (!OCFS2_HAS_RO_COMPAT_FEATURE(sb, feature[type]))
417418
continue;
418419
/* At this point, journal of the slot is already replayed so
@@ -589,8 +590,8 @@ int ocfs2_finish_quota_recovery(struct ocfs2_super *osb,
589590
struct ocfs2_quota_recovery *rec,
590591
int slot_num)
591592
{
592-
unsigned int ino[MAXQUOTAS] = { LOCAL_USER_QUOTA_SYSTEM_INODE,
593-
LOCAL_GROUP_QUOTA_SYSTEM_INODE };
593+
unsigned int ino[OCFS2_MAXQUOTAS] = { LOCAL_USER_QUOTA_SYSTEM_INODE,
594+
LOCAL_GROUP_QUOTA_SYSTEM_INODE };
594595
struct super_block *sb = osb->sb;
595596
struct ocfs2_local_disk_dqinfo *ldinfo;
596597
struct buffer_head *bh;
@@ -604,7 +605,7 @@ int ocfs2_finish_quota_recovery(struct ocfs2_super *osb,
604605
"slot %u\n", osb->dev_str, slot_num);
605606

606607
mutex_lock(&sb_dqopt(sb)->dqonoff_mutex);
607-
for (type = 0; type < MAXQUOTAS; type++) {
608+
for (type = 0; type < OCFS2_MAXQUOTAS; type++) {
608609
if (list_empty(&(rec->r_list[type])))
609610
continue;
610611
trace_ocfs2_finish_quota_recovery(slot_num);

‎fs/ocfs2/super.c

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -899,11 +899,12 @@ static int ocfs2_susp_quotas(struct ocfs2_super *osb, int unsuspend)
899899
{
900900
int type;
901901
struct super_block *sb = osb->sb;
902-
unsigned int feature[MAXQUOTAS] = { OCFS2_FEATURE_RO_COMPAT_USRQUOTA,
903-
OCFS2_FEATURE_RO_COMPAT_GRPQUOTA};
902+
unsigned int feature[OCFS2_MAXQUOTAS] = {
903+
OCFS2_FEATURE_RO_COMPAT_USRQUOTA,
904+
OCFS2_FEATURE_RO_COMPAT_GRPQUOTA};
904905
int status = 0;
905906

906-
for (type = 0; type < MAXQUOTAS; type++) {
907+
for (type = 0; type < OCFS2_MAXQUOTAS; type++) {
907908
if (!OCFS2_HAS_RO_COMPAT_FEATURE(sb, feature[type]))
908909
continue;
909910
if (unsuspend)
@@ -927,17 +928,19 @@ static int ocfs2_susp_quotas(struct ocfs2_super *osb, int unsuspend)
927928

928929
static int ocfs2_enable_quotas(struct ocfs2_super *osb)
929930
{
930-
struct inode *inode[MAXQUOTAS] = { NULL, NULL };
931+
struct inode *inode[OCFS2_MAXQUOTAS] = { NULL, NULL };
931932
struct super_block *sb = osb->sb;
932-
unsigned int feature[MAXQUOTAS] = { OCFS2_FEATURE_RO_COMPAT_USRQUOTA,
933-
OCFS2_FEATURE_RO_COMPAT_GRPQUOTA};
934-
unsigned int ino[MAXQUOTAS] = { LOCAL_USER_QUOTA_SYSTEM_INODE,
933+
unsigned int feature[OCFS2_MAXQUOTAS] = {
934+
OCFS2_FEATURE_RO_COMPAT_USRQUOTA,
935+
OCFS2_FEATURE_RO_COMPAT_GRPQUOTA};
936+
unsigned int ino[OCFS2_MAXQUOTAS] = {
937+
LOCAL_USER_QUOTA_SYSTEM_INODE,
935938
LOCAL_GROUP_QUOTA_SYSTEM_INODE };
936939
int status;
937940
int type;
938941

939942
sb_dqopt(sb)->flags |= DQUOT_QUOTA_SYS_FILE | DQUOT_NEGATIVE_USAGE;
940-
for (type = 0; type < MAXQUOTAS; type++) {
943+
for (type = 0; type < OCFS2_MAXQUOTAS; type++) {
941944
if (!OCFS2_HAS_RO_COMPAT_FEATURE(sb, feature[type]))
942945
continue;
943946
inode[type] = ocfs2_get_system_file_inode(osb, ino[type],
@@ -952,12 +955,12 @@ static int ocfs2_enable_quotas(struct ocfs2_super *osb)
952955
goto out_quota_off;
953956
}
954957

955-
for (type = 0; type < MAXQUOTAS; type++)
958+
for (type = 0; type < OCFS2_MAXQUOTAS; type++)
956959
iput(inode[type]);
957960
return 0;
958961
out_quota_off:
959962
ocfs2_disable_quotas(osb);
960-
for (type = 0; type < MAXQUOTAS; type++)
963+
for (type = 0; type < OCFS2_MAXQUOTAS; type++)
961964
iput(inode[type]);
962965
mlog_errno(status);
963966
return status;
@@ -972,7 +975,7 @@ static void ocfs2_disable_quotas(struct ocfs2_super *osb)
972975

973976
/* We mostly ignore errors in this function because there's not much
974977
* we can do when we see them */
975-
for (type = 0; type < MAXQUOTAS; type++) {
978+
for (type = 0; type < OCFS2_MAXQUOTAS; type++) {
976979
if (!sb_has_quota_loaded(sb, type))
977980
continue;
978981
/* Cancel periodic syncing before we grab dqonoff_mutex */
@@ -993,8 +996,9 @@ static void ocfs2_disable_quotas(struct ocfs2_super *osb)
993996
/* Handle quota on quotactl */
994997
static int ocfs2_quota_on(struct super_block *sb, int type, int format_id)
995998
{
996-
unsigned int feature[MAXQUOTAS] = { OCFS2_FEATURE_RO_COMPAT_USRQUOTA,
997-
OCFS2_FEATURE_RO_COMPAT_GRPQUOTA};
999+
unsigned int feature[OCFS2_MAXQUOTAS] = {
1000+
OCFS2_FEATURE_RO_COMPAT_USRQUOTA,
1001+
OCFS2_FEATURE_RO_COMPAT_GRPQUOTA};
9981002

9991003
if (!OCFS2_HAS_RO_COMPAT_FEATURE(sb, feature[type]))
10001004
return -EINVAL;

‎fs/reiserfs/reiserfs.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,9 @@ typedef struct reiserfs_proc_info_data {
506506
} reiserfs_proc_info_data_t;
507507
#endif
508508

509+
/* Number of quota types we support */
510+
#define REISERFS_MAXQUOTAS 2
511+
509512
/* reiserfs union of in-core super block data */
510513
struct reiserfs_sb_info {
511514
/* Buffer containing the super block */
@@ -615,7 +618,7 @@ struct reiserfs_sb_info {
615618
spinlock_t old_work_lock; /* protects old_work and work_queued */
616619

617620
#ifdef CONFIG_QUOTA
618-
char *s_qf_names[MAXQUOTAS];
621+
char *s_qf_names[REISERFS_MAXQUOTAS];
619622
int s_jquota_fmt;
620623
#endif
621624
char *s_jdev; /* Stored jdev for mount option showing */

‎fs/reiserfs/super.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ static int finish_unfinished(struct super_block *s)
206206
#ifdef CONFIG_QUOTA
207207
int i;
208208
int ms_active_set;
209-
int quota_enabled[MAXQUOTAS];
209+
int quota_enabled[REISERFS_MAXQUOTAS];
210210
#endif
211211

212212
/* compose key to look for "save" links */
@@ -227,7 +227,7 @@ static int finish_unfinished(struct super_block *s)
227227
s->s_flags |= MS_ACTIVE;
228228
}
229229
/* Turn on quotas so that they are updated correctly */
230-
for (i = 0; i < MAXQUOTAS; i++) {
230+
for (i = 0; i < REISERFS_MAXQUOTAS; i++) {
231231
quota_enabled[i] = 1;
232232
if (REISERFS_SB(s)->s_qf_names[i]) {
233233
int ret;
@@ -370,7 +370,7 @@ static int finish_unfinished(struct super_block *s)
370370
#ifdef CONFIG_QUOTA
371371
/* Turn quotas off */
372372
reiserfs_write_unlock(s);
373-
for (i = 0; i < MAXQUOTAS; i++) {
373+
for (i = 0; i < REISERFS_MAXQUOTAS; i++) {
374374
if (sb_dqopt(s)->files[i] && quota_enabled[i])
375375
dquot_quota_off(s, i);
376376
}
@@ -1360,7 +1360,7 @@ static void handle_quota_files(struct super_block *s, char **qf_names,
13601360
{
13611361
int i;
13621362

1363-
for (i = 0; i < MAXQUOTAS; i++) {
1363+
for (i = 0; i < REISERFS_MAXQUOTAS; i++) {
13641364
if (qf_names[i] != REISERFS_SB(s)->s_qf_names[i])
13651365
kfree(REISERFS_SB(s)->s_qf_names[i]);
13661366
REISERFS_SB(s)->s_qf_names[i] = qf_names[i];
@@ -1381,7 +1381,7 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg)
13811381
struct reiserfs_journal *journal = SB_JOURNAL(s);
13821382
char *new_opts = kstrdup(arg, GFP_KERNEL);
13831383
int err;
1384-
char *qf_names[MAXQUOTAS];
1384+
char *qf_names[REISERFS_MAXQUOTAS];
13851385
unsigned int qfmt = 0;
13861386
#ifdef CONFIG_QUOTA
13871387
int i;
@@ -1400,7 +1400,7 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg)
14001400
(s, arg, &mount_options, &blocks, NULL, &commit_max_age,
14011401
qf_names, &qfmt)) {
14021402
#ifdef CONFIG_QUOTA
1403-
for (i = 0; i < MAXQUOTAS; i++)
1403+
for (i = 0; i < REISERFS_MAXQUOTAS; i++)
14041404
if (qf_names[i] != REISERFS_SB(s)->s_qf_names[i])
14051405
kfree(qf_names[i]);
14061406
#endif
@@ -1844,7 +1844,7 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
18441844
char *jdev_name;
18451845
struct reiserfs_sb_info *sbi;
18461846
int errval = -EINVAL;
1847-
char *qf_names[MAXQUOTAS] = {};
1847+
char *qf_names[REISERFS_MAXQUOTAS] = {};
18481848
unsigned int qfmt = 0;
18491849

18501850
save_mount_options(s, data);
@@ -2169,7 +2169,7 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
21692169
#ifdef CONFIG_QUOTA
21702170
{
21712171
int j;
2172-
for (j = 0; j < MAXQUOTAS; j++)
2172+
for (j = 0; j < REISERFS_MAXQUOTAS; j++)
21732173
kfree(qf_names[j]);
21742174
}
21752175
#endif

0 commit comments

Comments
 (0)