diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-06 13:07:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-06 13:07:41 -0700 |
| commit | 38583f095c5a8138ae2a1c9173d0fd8a9f10e8aa (patch) | |
| tree | 7ff369517a57ee59be45ecccd375d22d6157c786 /fs/affs/super.c | |
| parent | 8169d3005e3bae9bff40349d7caeac5938682297 (diff) | |
| parent | 3ca9e5d36afb5c0a6ee6ceee69e507370beb59c6 (diff) | |
| download | talos-op-linux-38583f095c5a8138ae2a1c9173d0fd8a9f10e8aa.tar.gz talos-op-linux-38583f095c5a8138ae2a1c9173d0fd8a9f10e8aa.zip | |
Merge branch 'akpm' (incoming from Andrew)
Merge misc fixes from Andrew Morton:
"13 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
agp: info leak in agpioc_info_wrap()
fs/affs/super.c: bugfix / double free
fanotify: fix -EOVERFLOW with large files on 64-bit
slub: use sysfs'es release mechanism for kmem_cache
revert "mm: vmscan: do not swap anon pages just because free+file is low"
autofs: fix lockref lookup
mm: filemap: update find_get_pages_tag() to deal with shadow entries
mm/compaction: make isolate_freepages start at pageblock boundary
MAINTAINERS: zswap/zbud: change maintainer email address
mm/page-writeback.c: fix divide by zero in pos_ratio_polynom
hugetlb: ensure hugepage access is denied if hugepages are not supported
slub: fix memcg_propagate_slab_attrs
drivers/rtc/rtc-pcf8523.c: fix month definition
Diffstat (limited to 'fs/affs/super.c')
| -rw-r--r-- | fs/affs/super.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/affs/super.c b/fs/affs/super.c index 6d589f28bf9b..895ac7dc9dbf 100644 --- a/fs/affs/super.c +++ b/fs/affs/super.c @@ -340,8 +340,6 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent) &blocksize,&sbi->s_prefix, sbi->s_volume, &mount_flags)) { printk(KERN_ERR "AFFS: Error parsing options\n"); - kfree(sbi->s_prefix); - kfree(sbi); return -EINVAL; } /* N.B. after this point s_prefix must be released */ |
