diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-26 09:52:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-26 09:52:05 -0700 |
| commit | 47a469421d792dcb91a1e73319d26134241953d2 (patch) | |
| tree | 6a388381a434ebe87fed2fbb10a53ced7a7ce8b5 /fs/ext4 | |
| parent | c13c81006314ad76c2b31824960a900385601b8b (diff) | |
| parent | 51229b495340bd7a02ce3622d1966829b67054ea (diff) | |
| download | op-kernel-dev-47a469421d792dcb91a1e73319d26134241953d2.zip op-kernel-dev-47a469421d792dcb91a1e73319d26134241953d2.tar.gz | |
Merge branch 'akpm' (patches from Andrew)
Merge second patchbomb from Andrew Morton:
- most of the rest of MM
- lots of misc things
- procfs updates
- printk feature work
- updates to get_maintainer, MAINTAINERS, checkpatch
- lib/ updates
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (96 commits)
exit,stats: /* obey this comment */
coredump: add __printf attribute to cn_*printf functions
coredump: use from_kuid/kgid when formatting corename
fs/reiserfs: remove unneeded cast
NILFS2: support NFSv2 export
fs/befs/btree.c: remove unneeded initializations
fs/minix: remove unneeded cast
init/do_mounts.c: add create_dev() failure log
kasan: remove duplicate definition of the macro KASAN_FREE_PAGE
fs/efs: femove unneeded cast
checkpatch: emit "NOTE: <types>" message only once after multiple files
checkpatch: emit an error when there's a diff in a changelog
checkpatch: validate MODULE_LICENSE content
checkpatch: add multi-line handling for PREFER_ETHER_ADDR_COPY
checkpatch: suggest using eth_zero_addr() and eth_broadcast_addr()
checkpatch: fix processing of MEMSET issues
checkpatch: suggest using ether_addr_equal*()
checkpatch: avoid NOT_UNIFIED_DIFF errors on cover-letter.patch files
checkpatch: remove local from codespell path
checkpatch: add --showfile to allow input via pipe to show filenames
...
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/super.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index a7b4b6e..5c78764 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3446,7 +3446,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) unsigned long journal_devnum = 0; unsigned long def_mount_opts; struct inode *root; - char *cp; const char *descr; int ret = -ENOMEM; int blocksize, clustersize; @@ -3477,8 +3476,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) part_stat_read(sb->s_bdev->bd_part, sectors[1]); /* Cleanup superblock name */ - for (cp = sb->s_id; (cp = strchr(cp, '/'));) - *cp = '!'; + strreplace(sb->s_id, '/', '!'); /* -EINVAL is default */ ret = -EINVAL; |
