diff options
| author | Tom Rini <trini@konsulko.com> | 2016-04-25 13:32:18 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-04-25 13:32:18 -0400 |
| commit | 3aee11c8ee7aa1e293a8a8fe83b362ca12c08d15 (patch) | |
| tree | 471ee528bd71bd586b27beddd48ca64a039316e2 | |
| parent | 65341967ce9ef2656c61dcd3126536e8865c349d (diff) | |
| parent | b1d6590d357bde2332cb699e2fd2efc7a7c64f38 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-ubi
| -rw-r--r-- | drivers/mtd/ubi/wl.c | 2 | ||||
| -rw-r--r-- | fs/ubifs/super.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c index 507b091720..e823ca56f2 100644 --- a/drivers/mtd/ubi/wl.c +++ b/drivers/mtd/ubi/wl.c @@ -1528,6 +1528,7 @@ int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai) INIT_LIST_HEAD(&ubi->pq[i]); ubi->pq_head = 0; + ubi->free_count = 0; list_for_each_entry_safe(aeb, tmp, &ai->erase, u.list) { cond_resched(); @@ -1546,7 +1547,6 @@ int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai) found_pebs++; } - ubi->free_count = 0; list_for_each_entry(aeb, &ai->free, u.list) { cond_resched(); diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index dcf3a47947..effa8d933f 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -48,7 +48,6 @@ struct vfsmount; #define INODE_LOCKED_MAX 64 struct super_block *ubifs_sb; -LIST_HEAD(super_blocks); static struct inode *inodes_locked_down[INODE_LOCKED_MAX]; @@ -2425,10 +2424,10 @@ retry: s->s_type = type; #ifndef __UBOOT__ strlcpy(s->s_id, type->name, sizeof(s->s_id)); + list_add_tail(&s->s_list, &super_blocks); #else strncpy(s->s_id, type->name, sizeof(s->s_id)); #endif - list_add_tail(&s->s_list, &super_blocks); hlist_add_head(&s->s_instances, &type->fs_supers); #ifndef __UBOOT__ spin_unlock(&sb_lock); |