From bb7ed2adc277ae76d82af11f378c54a70692b311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Engel?= Date: Sun, 25 Apr 2010 08:54:42 +0200 Subject: [PATCH] --- yaml --- r: 190341 b: refs/heads/master c: 5129a469a91a91427334c40e29e64c6d0ab68caf h: refs/heads/master i: 190339: 067a4a390dd82ef0d196496b309b8706de889f91 v: v3 --- [refs] | 2 +- trunk/fs/super.c | 8 +++++--- trunk/fs/sync.c | 3 ++- trunk/include/linux/backing-dev.h | 1 + trunk/mm/backing-dev.c | 5 +++++ 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 94b2a488aae5..cf0aa3d6ff71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e2455c1a123ceadbb35150a610d61e8443fd340 +refs/heads/master: 5129a469a91a91427334c40e29e64c6d0ab68caf diff --git a/trunk/fs/super.c b/trunk/fs/super.c index f35ac6022109..dc72491a19f9 100644 --- a/trunk/fs/super.c +++ b/trunk/fs/super.c @@ -693,6 +693,7 @@ int set_anon_super(struct super_block *s, void *data) return -EMFILE; } s->s_dev = MKDEV(0, dev & MINORMASK); + s->s_bdi = &noop_backing_dev_info; return 0; } @@ -954,10 +955,11 @@ vfs_kern_mount(struct file_system_type *type, int flags, const char *name, void if (error < 0) goto out_free_secdata; BUG_ON(!mnt->mnt_sb); + WARN_ON(!mnt->mnt_sb->s_bdi); - error = security_sb_kern_mount(mnt->mnt_sb, flags, secdata); - if (error) - goto out_sb; + error = security_sb_kern_mount(mnt->mnt_sb, flags, secdata); + if (error) + goto out_sb; /* * filesystems should never set s_maxbytes larger than MAX_LFS_FILESIZE diff --git a/trunk/fs/sync.c b/trunk/fs/sync.c index fc5c3d75cf3c..92b228176f7c 100644 --- a/trunk/fs/sync.c +++ b/trunk/fs/sync.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "internal.h" #define VALID_FLAGS (SYNC_FILE_RANGE_WAIT_BEFORE|SYNC_FILE_RANGE_WRITE| \ @@ -32,7 +33,7 @@ static int __sync_filesystem(struct super_block *sb, int wait) * This should be safe, as we require bdi backing to actually * write out data in the first place */ - if (!sb->s_bdi) + if (!sb->s_bdi || sb->s_bdi == &noop_backing_dev_info) return 0; if (sb->s_qcop && sb->s_qcop->quota_sync) diff --git a/trunk/include/linux/backing-dev.h b/trunk/include/linux/backing-dev.h index e19c677f219c..bd0e3c6f323f 100644 --- a/trunk/include/linux/backing-dev.h +++ b/trunk/include/linux/backing-dev.h @@ -247,6 +247,7 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio); #endif extern struct backing_dev_info default_backing_dev_info; +extern struct backing_dev_info noop_backing_dev_info; void default_unplug_io_fn(struct backing_dev_info *bdi, struct page *page); int writeback_in_progress(struct backing_dev_info *bdi); diff --git a/trunk/mm/backing-dev.c b/trunk/mm/backing-dev.c index dbda4707f593..707d0dc6da0f 100644 --- a/trunk/mm/backing-dev.c +++ b/trunk/mm/backing-dev.c @@ -27,6 +27,11 @@ struct backing_dev_info default_backing_dev_info = { }; EXPORT_SYMBOL_GPL(default_backing_dev_info); +struct backing_dev_info noop_backing_dev_info = { + .name = "noop", +}; +EXPORT_SYMBOL_GPL(noop_backing_dev_info); + static struct class *bdi_class; /*