---

yaml --- r: 164288 b: refs/heads/master c: 48d0764 h: refs/heads/master v: v3
git-mirror · Sep 21, 2009 · 3298d89 · 3298d89
1 parent 3d99317
commit 3298d89
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87c6a9b253520b66e7f5e8f67a37a701eaa51cee
+refs/heads/master: 48d0764998ad4ab7570afab8bb3bee0fbfa55b2a
diff --git a/trunk/fs/nfs/client.c b/trunk/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;
 }