mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
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
This commit is contained in:
commit
58e75a0973
3 changed files with 17 additions and 6 deletions
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue