exofs: Fix "add bdi backing to mount session" fall out
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: exofs: add bdi backing to mount session
Quoted 8 lines · Linux Kernel Mailing List
Gitweb: http://git.kernel.org/linus/b3d0ab7e60d1865bb6f6a79a77aaba22f2543236 Commit: b3d0ab7e60d1865bb6f6a79a77aaba22f2543236 Parent: 9df9c8b930156a2f9ce2b2ae66acb14bee2663f5 Author: Jens Axboe <[email protected]> AuthorDate: Thu Apr 22 12:26:04 2010 +0200 Committer: Jens Axboe <[email protected]> CommitDate: Thu Apr 22 12:26:04 2010 +0200
Quoted 5 lines
exofs: add bdi backing to mount session
This ensures that dirty data gets flushed properly.
Signed-off-by Jens Axboe <[email protected]>
This patch introduced a bug (together with a fix). I'm sorry that my "Linux Kernel Mailing List" filtering techniques are lacking and I missed it completely. Searching on google I can see it was hiding under "[GIT PULL] block/writeback bits for 2.6.34-rc". I have only seen it now, in git-commits-head ml.
I wish filesystem related patches where CC to linux-fsdevel, and/or posted as individual patches, sigh.
I'll post a fix as reply to this mail. Linus please submit.
Boaz
Quoted 70 lines
--- fs/exofs/exofs.h | 2 ++ fs/exofs/super.c | 8 ++++++++ 2 files changed, 10 insertions(+), 0 deletions(-)fs/exofs/exofs.h +2
-0@@ -35,6 +35,7 @@#include <linux/fs.h> #include <linux/time.h> +#include <linux/backing-dev.h> #include "common.h" /* FIXME: Remove once pnfs hits mainline @@ -92,6 +93,7 @@ struct exofs_sb_info {struct exofs_layout layout;/* Default files layout, * contains the variable osd_dev * array. Keep last */ +struct backing_dev_info bdi;struct osd_dev *_min_one_dev[1 ];/* Place holder for one dev */ };fs/exofs/super.c +8
-1@@ -302,6 +302,7 @@ static void exofs_put_super(struct super_block *sb)_exofs_print_device ("Unmounting" ,NULL , sbi->layout.s_ods[0 ], sbi->layout.s_pid); +bdi_destroy (&sbi->bdi);exofs_free_sbi (sbi); sb->s_fs_info =NULL ; }@@ -546,6 +547,10 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent)if (!sbi)return -ENOMEM ; + ret =bdi_setup_and_register (&sbi->bdi,"exofs" ,BDI_CAP_MAP_COPY ); +if (ret) + goto free_bdi; +/* use mount options to fill superblock */ od =osduld_path_lookup (opts->dev_name);if (IS_ERR (od)) {@@ -612,6 +617,7 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent) }/* set up operation vectors */ + sb->s_bdi = &sbi->bdi; sb->s_fs_info = sbi; sb->s_op = &exofs_sops; sb->s_export_op = &exofs_export_ops;@@ -643,6 +649,8 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent)return 0 ; free_sbi: +bdi_destroy (&sbi->bdi); +free_bdi:EXOFS_ERR ("Unable to mount exofs on %s pid=0x%llx err=%d\n" , opts->dev_name, sbi->layout.s_pid, ret);exofs_free_sbi (sbi); --To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 1/1 exofs: Fix "add bdi backing to mount session" fall out
The patch: add bdi backing to mount session
(b3d0ab7e60d1865bb6f6a79a77aaba22f2543236)
Has a bug in the placement of the bdi member at struct exofs_sb_info. The layout member must be kept last.
--- fs/exofs/exofs.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/exofs/exofs.h +1 -1
@@ -85,6 +85,7 @@ struct exofs_sb_info {u32 s_next_generation;/* next gen # to use */ atomic_t s_curr_pending;/* number of pending commands */ uint8_t s_cred[OSD_CAP_LEN ];/* credential for the fscb */ +struct backing_dev_info bdi;/* register our bdi with VFS */ struct pnfs_osd_data_map data_map;/* Default raid to use * FIXME: Needed ?
@@ -93,7 +94,6 @@ struct exofs_sb_info {struct exofs_layout layout;/* Default files layout, * contains the variable osd_dev * array. Keep last */ -struct backing_dev_info bdi;struct osd_dev *_min_one_dev[1 ];/* Place holder for one dev */ };
Signature · 1 line
1.6.6.1
Quoted 26 lines · Boaz Harrosh
The patch: add bdi backing to mount session
(b3d0ab7e60d1865bb6f6a79a77aaba22f2543236)Has a bug in the placement of the bdi member at struct
exofs_sb_info. The layout member must be kept last.Signed-off-by Boaz Harrosh <[email protected]>--- fs/exofs/exofs.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)fs/exofs/exofs.h +1
-0@@ -85,6 +85,7 @@ struct exofs_sb_info {u32 s_next_generation;/* next gen # to use */ atomic_t s_curr_pending;/* number of pending commands */ uint8_t s_cred[OSD_CAP_LEN ];/* credential for the fscb */ +struct backing_dev_info bdi;/* register our bdi with VFS */ struct pnfs_osd_data_map data_map;/* Default raid to use * FIXME: Needed ?
fs/exofs/exofs.h struct exofs_sb_info { · line 98
Quoted 6 lines
fs/exofs/exofs.h +0
-1@@ -93,7 +94,6 @@ struct exofs_sb_info {struct exofs_layout layout;/* Default files layout, * contains the variable osd_dev * array. Keep last */ -struct backing_dev_info bdi;struct osd_dev *_min_one_dev[1 ];/* Place holder for one dev */ };
Irk, silly mistake. Apparently I missed the comment, and I did move it prior to _min_one_dev[] but didn't think enough about it.
Signature · 1 line
Jens Axboe