Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 190337
b: refs/heads/master
c: 424264b
h: refs/heads/master
i:
  190335: 51407d4
v: v3
  • Loading branch information
Jens Axboe committed Apr 22, 2010
1 parent 2b710de commit 1d03396
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f1970c73cbb6b884152207e4dfe90639f5029905
refs/heads/master: 424264b7b220e8eee165dc3080ae48692af73dec
8 changes: 8 additions & 0 deletions trunk/fs/smbfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,7 @@ smb_put_super(struct super_block *sb)
if (server->conn_pid)
kill_pid(server->conn_pid, SIGTERM, 1);

bdi_destroy(&server->bdi);
kfree(server->ops);
smb_unload_nls(server);
sb->s_fs_info = NULL;
Expand Down Expand Up @@ -525,6 +526,11 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
if (!server)
goto out_no_server;
sb->s_fs_info = server;

if (bdi_setup_and_register(&server->bdi, "smbfs", BDI_CAP_MAP_COPY))
goto out_bdi;

sb->s_bdi = &server->bdi;

server->super_block = sb;
server->mnt = NULL;
Expand Down Expand Up @@ -624,6 +630,8 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
out_bad_option:
kfree(mem);
out_no_mem:
bdi_destroy(&server->bdi);
out_bdi:
if (!server->mnt)
printk(KERN_ERR "smb_fill_super: allocation failure\n");
sb->s_fs_info = NULL;
Expand Down
3 changes: 3 additions & 0 deletions trunk/include/linux/smb_fs_sb.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#define _SMB_FS_SB

#include <linux/types.h>
#include <linux/backing-dev.h>
#include <linux/smb.h>

/*
Expand Down Expand Up @@ -74,6 +75,8 @@ struct smb_sb_info {
struct smb_ops *ops;

struct super_block *super_block;

struct backing_dev_info bdi;
};

static inline int
Expand Down

0 comments on commit 1d03396

Please sign in to comment.