diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /fs/befs | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'fs/befs')
| -rw-r--r-- | fs/befs/datastream.c | 1 | ||||
| -rw-r--r-- | fs/befs/linuxvfs.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/fs/befs/datastream.c b/fs/befs/datastream.c index e3287d0d1a58..59096b5e0fc7 100644 --- a/fs/befs/datastream.c +++ b/fs/befs/datastream.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 14 | #include <linux/slab.h> | ||
| 15 | #include <linux/buffer_head.h> | 14 | #include <linux/buffer_head.h> |
| 16 | #include <linux/string.h> | 15 | #include <linux/string.h> |
| 17 | 16 | ||
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index 33baf27fac78..34ddda888e63 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c | |||
| @@ -873,6 +873,7 @@ befs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 873 | brelse(bh); | 873 | brelse(bh); |
| 874 | 874 | ||
| 875 | unacquire_priv_sbp: | 875 | unacquire_priv_sbp: |
| 876 | kfree(befs_sb->mount_opts.iocharset); | ||
| 876 | kfree(sb->s_fs_info); | 877 | kfree(sb->s_fs_info); |
| 877 | 878 | ||
| 878 | unacquire_none: | 879 | unacquire_none: |