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
This commit is contained in:
@@ -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 */
|
||||
|
@@ -179,7 +179,7 @@ static struct dentry *autofs4_lookup_active(struct dentry *dentry)
|
||||
spin_lock(&active->d_lock);
|
||||
|
||||
/* Already gone? */
|
||||
if (!d_count(active))
|
||||
if ((int) d_count(active) <= 0)
|
||||
goto next;
|
||||
|
||||
qstr = &active->d_name;
|
||||
@@ -230,7 +230,7 @@ static struct dentry *autofs4_lookup_expiring(struct dentry *dentry)
|
||||
|
||||
spin_lock(&expiring->d_lock);
|
||||
|
||||
/* Bad luck, we've already been dentry_iput */
|
||||
/* We've already been dentry_iput or unlinked */
|
||||
if (!expiring->d_inode)
|
||||
goto next;
|
||||
|
||||
|
@@ -1030,6 +1030,11 @@ static int __init init_hugetlbfs_fs(void)
|
||||
int error;
|
||||
int i;
|
||||
|
||||
if (!hugepages_supported()) {
|
||||
pr_info("hugetlbfs: disabling because there are no supported hugepage sizes\n");
|
||||
return -ENOTSUPP;
|
||||
}
|
||||
|
||||
error = bdi_init(&hugetlbfs_backing_dev_info);
|
||||
if (error)
|
||||
return error;
|
||||
|
@@ -698,6 +698,8 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags)
|
||||
}
|
||||
group->overflow_event = &oevent->fse;
|
||||
|
||||
if (force_o_largefile())
|
||||
event_f_flags |= O_LARGEFILE;
|
||||
group->fanotify_data.f_flags = event_f_flags;
|
||||
#ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
|
||||
spin_lock_init(&group->fanotify_data.access_lock);
|
||||
|
Referens i nytt ärende
Block a user