diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 20:04:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 20:04:27 -0700 |
| commit | afb9bd704c7116076879352a2cc2c43aa12c1e14 (patch) | |
| tree | b622fba5044ef3111050ca9dacce207ba49fea39 /fs | |
| parent | 58df9b387c5f240566ac15b7fa5136f5a35bb19a (diff) | |
| parent | 72749a270b6d254b4a018e290b853c27edb2fa62 (diff) | |
| download | kernel-common-afb9bd704c7116076879352a2cc2c43aa12c1e14.tar.gz kernel-common-afb9bd704c7116076879352a2cc2c43aa12c1e14.tar.bz2 kernel-common-afb9bd704c7116076879352a2cc2c43aa12c1e14.zip | |
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
Pull trivial exofs changes from Boaz Harrosh:
"Just nothingness really. The big exofs changes are reserved for the
next merge window."
* 'for-linus' of git://git.open-osd.org/linux-open-osd:
exofs: Cap on the memcpy() size
exofs: (trivial) Fix typo in super.c
exofs: fix endian conversion in exofs_sync_fs()
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/exofs/super.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/exofs/super.c b/fs/exofs/super.c index 7f2b590a36b7..735ca06430ac 100644 --- a/fs/exofs/super.c +++ b/fs/exofs/super.c @@ -389,7 +389,7 @@ static int exofs_sync_fs(struct super_block *sb, int wait) ios->length = offsetof(struct exofs_fscb, s_dev_table_oid); memset(fscb, 0, ios->length); fscb->s_nextid = cpu_to_le64(sbi->s_nextid); - fscb->s_numfiles = cpu_to_le32(sbi->s_numfiles); + fscb->s_numfiles = cpu_to_le64(sbi->s_numfiles); fscb->s_magic = cpu_to_le16(sb->s_magic); fscb->s_newfs = 0; fscb->s_version = EXOFS_FSCB_VER; @@ -529,7 +529,8 @@ static int exofs_devs_2_odi(struct exofs_dt_device_info *dt_dev, struct osd_dev_info *odi) { odi->systemid_len = le32_to_cpu(dt_dev->systemid_len); - memcpy(odi->systemid, dt_dev->systemid, odi->systemid_len); + if (likely(odi->systemid_len)) + memcpy(odi->systemid, dt_dev->systemid, OSD_SYSTEMID_LEN); odi->osdname_len = le32_to_cpu(dt_dev->osdname_len); odi->osdname = dt_dev->osdname; @@ -565,7 +566,7 @@ int __alloc_dev_table(struct exofs_sb_info *sbi, unsigned numdevs, aoded = kzalloc(sizeof(*aoded), GFP_KERNEL); if (unlikely(!aoded)) { - EXOFS_ERR("ERROR: faild allocating Device array[%d]\n", + EXOFS_ERR("ERROR: failed allocating Device array[%d]\n", numdevs); return -ENOMEM; } |