aboutsummaryrefslogtreecommitdiffstats
path: root/fs/exofs/exofs.h
diff options
context:
space:
mode:
authorBoaz Harrosh <bharrosh@panasas.com>2011-07-27 20:51:53 -0400
committerBoaz Harrosh <bharrosh@panasas.com>2011-08-04 15:35:20 -0400
commit6d4073e88132259485ef1b2c88daa5e50c95789c (patch)
tree04876cbe47e462bca7dad51ec33ccb29080d5680 /fs/exofs/exofs.h
parent26ae93c2dc7152463d319c28768f242a11a54620 (diff)
exofs: BUG: Avoid sbi realloc
Since the beginning we realloced the sbi structure when a bigger then one device table was specified. (I know that was really stupid). Then much later when "register bdi" was added (By Jens) it was registering the pointer to sbi->bdi before the realloc. We never saw this problem because up till now the realloc did not do anything since the device table was small enough to fit in the original allocation. But once we starting testing with large device tables (Bigger then 28) we noticed the crash of writeback operating on a deallocated pointer. * Avoid the all mess by allocating the device-table as a second array and get rid of the variable-sized structure and the rest of this mess. * Take the chance to clean near by structures and comments. * Add a needed dprint on startup to indicate the loaded layout. * Also move the bdi registration to the very end because it will only fail in a low memory, which will probably fail before hand. There are many more likely causes to not load before that. This way the error handling is made simpler. (Just doing this would be enough to fix the BUG) Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Diffstat (limited to 'fs/exofs/exofs.h')
-rw-r--r--fs/exofs/exofs.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/exofs/exofs.h b/fs/exofs/exofs.h
index e103dbd86fe1..9f62349a5a5c 100644
--- a/fs/exofs/exofs.h
+++ b/fs/exofs/exofs.h
@@ -66,13 +66,14 @@ struct exofs_layout {
66 enum exofs_inode_layout_gen_functions lay_func; 66 enum exofs_inode_layout_gen_functions lay_func;
67 67
68 unsigned s_numdevs; /* Num of devices in array */ 68 unsigned s_numdevs; /* Num of devices in array */
69 struct osd_dev *s_ods[0]; /* Variable length */ 69 struct osd_dev **s_ods; /* osd_dev array */
70}; 70};
71 71
72/* 72/*
73 * our extension to the in-memory superblock 73 * our extension to the in-memory superblock
74 */ 74 */
75struct exofs_sb_info { 75struct exofs_sb_info {
76 struct backing_dev_info bdi; /* register our bdi with VFS */
76 struct exofs_sb_stats s_ess; /* Written often, pre-allocate*/ 77 struct exofs_sb_stats s_ess; /* Written often, pre-allocate*/
77 int s_timeout; /* timeout for OSD operations */ 78 int s_timeout; /* timeout for OSD operations */
78 uint64_t s_nextid; /* highest object ID used */ 79 uint64_t s_nextid; /* highest object ID used */
@@ -81,15 +82,11 @@ struct exofs_sb_info {
81 u32 s_next_generation; /* next gen # to use */ 82 u32 s_next_generation; /* next gen # to use */
82 atomic_t s_curr_pending; /* number of pending commands */ 83 atomic_t s_curr_pending; /* number of pending commands */
83 uint8_t s_cred[OSD_CAP_LEN]; /* credential for the fscb */ 84 uint8_t s_cred[OSD_CAP_LEN]; /* credential for the fscb */
84 struct backing_dev_info bdi; /* register our bdi with VFS */
85 85
86 struct pnfs_osd_data_map data_map; /* Default raid to use 86 struct pnfs_osd_data_map data_map; /* Default raid to use
87 * FIXME: Needed ? 87 * FIXME: Needed ?
88 */ 88 */
89/* struct exofs_layout dir_layout;*/ /* Default dir layout */ 89 struct exofs_layout layout; /* Default files layout */
90 struct exofs_layout layout; /* Default files layout,
91 * contains the variable osd_dev
92 * array. Keep last */
93 struct osd_dev *_min_one_dev[1]; /* Place holder for one dev */ 90 struct osd_dev *_min_one_dev[1]; /* Place holder for one dev */
94}; 91};
95 92