Revision 737449236240e30a7bbe99f4d5586b8ed1416763 authored by Mel Gorman on 31 July 2012, 23:45:20 UTC, committed by Linus Torvalds on 01 August 2012, 01:42:48 UTC
Commit b3a27d ("swap: Add swap slot free callback to block_device_operations") dereferences p->bdev->bd_disk but this is a NULL dereference if using swap-over-NFS. This patch checks SWP_BLKDEV on the swap_info_struct before dereferencing. With reference to this callback, Christoph Hellwig stated "Please just remove the callback entirely. It has no user outside the staging tree and was added clearly against the rules for that staging tree". This would also be my preference but there was not an obvious way of keeping zram in staging/ happy. Signed-off-by: Xiaotian Feng <dfeng@redhat.com> Signed-off-by: Mel Gorman <mgorman@suse.de> Acked-by: Rik van Riel <riel@redhat.com> Cc: Christoph Hellwig <hch@infradead.org> Cc: David S. Miller <davem@davemloft.net> Cc: Eric B Munson <emunson@mgebm.net> Cc: Eric Paris <eparis@redhat.com> Cc: James Morris <jmorris@namei.org> Cc: Mel Gorman <mgorman@suse.de> Cc: Mike Christie <michaelc@cs.wisc.edu> Cc: Neil Brown <neilb@suse.de> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> Cc: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 192e501
File | Mode | Size |
---|---|---|
9p | ||
adfs | ||
affs | ||
afs | ||
autofs4 | ||
befs | ||
bfs | ||
btrfs | ||
cachefiles | ||
ceph | ||
cifs | ||
coda | ||
configfs | ||
cramfs | ||
debugfs | ||
devpts | ||
dlm | ||
ecryptfs | ||
efs | ||
exofs | ||
exportfs | ||
ext2 | ||
ext3 | ||
ext4 | ||
fat | ||
freevxfs | ||
fscache | ||
fuse | ||
gfs2 | ||
hfs | ||
hfsplus | ||
hostfs | ||
hpfs | ||
hppfs | ||
hugetlbfs | ||
isofs | ||
jbd | ||
jbd2 | ||
jffs2 | ||
jfs | ||
lockd | ||
logfs | ||
minix | ||
ncpfs | ||
nfs | ||
nfs_common | ||
nfsd | ||
nilfs2 | ||
nls | ||
notify | ||
ntfs | ||
ocfs2 | ||
omfs | ||
openpromfs | ||
proc | ||
pstore | ||
qnx4 | ||
qnx6 | ||
quota | ||
ramfs | ||
reiserfs | ||
romfs | ||
squashfs | ||
sysfs | ||
sysv | ||
ubifs | ||
udf | ||
ufs | ||
xfs | ||
Kconfig | -rw-r--r-- | 6.2 KB |
Kconfig.binfmt | -rw-r--r-- | 6.4 KB |
Makefile | -rw-r--r-- | 4.0 KB |
aio.c | -rw-r--r-- | 45.7 KB |
anon_inodes.c | -rw-r--r-- | 6.4 KB |
attr.c | -rw-r--r-- | 6.9 KB |
bad_inode.c | -rw-r--r-- | 7.7 KB |
binfmt_aout.c | -rw-r--r-- | 11.7 KB |
binfmt_elf.c | -rw-r--r-- | 54.7 KB |
binfmt_elf_fdpic.c | -rw-r--r-- | 48.5 KB |
binfmt_em86.c | -rw-r--r-- | 2.8 KB |
binfmt_flat.c | -rw-r--r-- | 26.7 KB |
binfmt_misc.c | -rw-r--r-- | 15.1 KB |
binfmt_script.c | -rw-r--r-- | 2.8 KB |
binfmt_som.c | -rw-r--r-- | 7.1 KB |
bio-integrity.c | -rw-r--r-- | 21.2 KB |
bio.c | -rw-r--r-- | 40.9 KB |
block_dev.c | -rw-r--r-- | 42.7 KB |
buffer.c | -rw-r--r-- | 85.5 KB |
char_dev.c | -rw-r--r-- | 13.8 KB |
compat.c | -rw-r--r-- | 44.5 KB |
compat_binfmt_elf.c | -rw-r--r-- | 3.5 KB |
compat_ioctl.c | -rw-r--r-- | 45.2 KB |
dcache.c | -rw-r--r-- | 80.4 KB |
dcookies.c | -rw-r--r-- | 6.8 KB |
direct-io.c | -rw-r--r-- | 37.2 KB |
drop_caches.c | -rw-r--r-- | 1.5 KB |
eventfd.c | -rw-r--r-- | 10.9 KB |
eventpoll.c | -rw-r--r-- | 53.4 KB |
exec.c | -rw-r--r-- | 53.6 KB |
fcntl.c | -rw-r--r-- | 19.4 KB |
fhandle.c | -rw-r--r-- | 6.5 KB |
fifo.c | -rw-r--r-- | 3.2 KB |
file.c | -rw-r--r-- | 11.8 KB |
file_table.c | -rw-r--r-- | 14.6 KB |
filesystems.c | -rw-r--r-- | 6.3 KB |
fs-writeback.c | -rw-r--r-- | 39.4 KB |
fs_struct.c | -rw-r--r-- | 3.6 KB |
generic_acl.c | -rw-r--r-- | 3.8 KB |
inode.c | -rw-r--r-- | 48.4 KB |
internal.h | -rw-r--r-- | 2.8 KB |
ioctl.c | -rw-r--r-- | 15.7 KB |
ioprio.c | -rw-r--r-- | 5.0 KB |
libfs.c | -rw-r--r-- | 25.8 KB |
locks.c | -rw-r--r-- | 59.0 KB |
mbcache.c | -rw-r--r-- | 16.4 KB |
mount.h | -rw-r--r-- | 2.2 KB |
mpage.c | -rw-r--r-- | 20.0 KB |
namei.c | -rw-r--r-- | 93.6 KB |
namespace.c | -rw-r--r-- | 62.9 KB |
no-block.c | -rw-r--r-- | 688 bytes |
open.c | -rw-r--r-- | 25.3 KB |
pipe.c | -rw-r--r-- | 29.0 KB |
pnode.c | -rw-r--r-- | 8.8 KB |
pnode.h | -rw-r--r-- | 1.4 KB |
posix_acl.c | -rw-r--r-- | 9.2 KB |
proc_namespace.c | -rw-r--r-- | 7.5 KB |
read_write.c | -rw-r--r-- | 22.5 KB |
read_write.h | -rw-r--r-- | 542 bytes |
readdir.c | -rw-r--r-- | 7.0 KB |
select.c | -rw-r--r-- | 24.1 KB |
seq_file.c | -rw-r--r-- | 19.5 KB |
signalfd.c | -rw-r--r-- | 8.1 KB |
splice.c | -rw-r--r-- | 46.5 KB |
stack.c | -rw-r--r-- | 2.5 KB |
stat.c | -rw-r--r-- | 11.0 KB |
statfs.c | -rw-r--r-- | 5.2 KB |
super.c | -rw-r--r-- | 29.9 KB |
sync.c | -rw-r--r-- | 10.8 KB |
timerfd.c | -rw-r--r-- | 8.6 KB |
utimes.c | -rw-r--r-- | 5.7 KB |
xattr.c | -rw-r--r-- | 18.0 KB |
xattr_acl.c | -rw-r--r-- | 2.3 KB |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...