diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2011-05-30 07:42:51 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-05-30 07:42:51 +0200 |
| commit | a1706ac4c0201ea0143dc0db0659001b26ceeabb (patch) | |
| tree | 51b1fc266708d34e0878eaf1e6435773067379a0 /include/linux/genhd.h | |
| parent | 5988ce239682854d4e632fb58bff000700830394 (diff) | |
| download | linux-stable-a1706ac4c0201ea0143dc0db0659001b26ceeabb.tar.gz linux-stable-a1706ac4c0201ea0143dc0db0659001b26ceeabb.tar.bz2 linux-stable-a1706ac4c0201ea0143dc0db0659001b26ceeabb.zip | |
Revert "block: Remove extra discard_alignment from hd_struct."
It was not a good idea to start dereferencing disk->queue from
the fs sysfs strategy for displaying discard alignment. We ran
into first a NULL pointer deref, and after fixing that we sometimes
see unvalid disk->queue pointer values.
Since discard is the only one of the bunch actually looking into
the queue, just revert the change.
This reverts commit 23ceb5b7719e9276d4fa72a3ecf94dd396755276.
Conflicts:
fs/partitions/check.c
Diffstat (limited to 'include/linux/genhd.h')
| -rw-r--r-- | include/linux/genhd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index b78956b3c2e7..300d7582006e 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -100,6 +100,7 @@ struct hd_struct { sector_t start_sect; sector_t nr_sects; sector_t alignment_offset; + unsigned int discard_alignment; struct device __dev; struct kobject *holder_dir; int policy, partno; |