aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-21 09:04:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-21 09:04:30 -0700
commit58e75a09732be9b850357ba3489bcfb103230b27 (patch)
tree60f1a6f9fa208fd627845a795e739c5ccf01d6bd /fs
parentc720f5655df159a630fa0290a0bd67c93e92b0bf (diff)
parent48d0764998ad4ab7570afab8bb3bee0fbfa55b2a (diff)
downloadlinux-linaro-58e75a09732be9b850357ba3489bcfb103230b27.tar.gz
Merge branch 'writeback' of git://git.kernel.dk/linux-2.6-block
* 'writeback' of git://git.kernel.dk/linux-2.6-block: nfs: initialize the backing_dev_info when creating the server writeback: make balance_dirty_pages() gradually back more off writeback: don't use schedule_timeout() without setting runstate nfs: nfs_kill_super() should call bdi_unregister() after killing super
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/client.c10
-rw-r--r--fs/nfs/super.c2
2 files changed, 7 insertions, 5 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index e350bd6a233..a7ce15d3c24 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -933,10 +933,6 @@ static int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *mntfh, str
goto out_error;
nfs_server_set_fsinfo(server, &fsinfo);
- error = bdi_init(&server->backing_dev_info);
- if (error)
- goto out_error;
-
/* Get some general file system info */
if (server->namelen == 0) {
@@ -995,6 +991,12 @@ static struct nfs_server *nfs_alloc_server(void)
return NULL;
}
+ if (bdi_init(&server->backing_dev_info)) {
+ nfs_free_iostats(server->io_stats);
+ kfree(server);
+ return NULL;
+ }
+
return server;
}
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index de935692d40..f1cc0587cfe 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2190,8 +2190,8 @@ static void nfs_kill_super(struct super_block *s)
{
struct nfs_server *server = NFS_SB(s);
- bdi_unregister(&server->backing_dev_info);
kill_anon_super(s);
+ bdi_unregister(&server->backing_dev_info);
nfs_fscache_release_super_cookie(s);
nfs_free_server(server);
}