diff options
Diffstat (limited to 'target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch')
| -rw-r--r-- | target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch b/target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch index ab89b98705..83b0fdeaaf 100644 --- a/target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch +++ b/target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch @@ -21,11 +21,9 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> fs/ubifs/ubifs.h | 2 +- 5 files changed, 22 insertions(+), 16 deletions(-) -diff --git a/fs/ubifs/commit.c b/fs/ubifs/commit.c -index ff82293..865d13f 100644 --- a/fs/ubifs/commit.c +++ b/fs/ubifs/commit.c -@@ -542,7 +542,7 @@ int dbg_old_index_check_init(struct ubifs_info *c, struct ubifs_zbranch *zroot) +@@ -542,7 +542,7 @@ int dbg_old_index_check_init(struct ubif if (!idx) return -ENOMEM; @@ -34,7 +32,7 @@ index ff82293..865d13f 100644 if (err) goto out; -@@ -610,7 +610,7 @@ int dbg_check_old_index(struct ubifs_info *c, struct ubifs_zbranch *zroot) +@@ -610,7 +610,7 @@ int dbg_check_old_index(struct ubifs_inf list_add_tail(&i->list, &list); /* Read the index node */ idx = &i->idx; @@ -43,11 +41,9 @@ index ff82293..865d13f 100644 if (err) goto out_free; /* Validate index node */ -diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c -index e18b988..51c4072 100644 --- a/fs/ubifs/io.c +++ b/fs/ubifs/io.c -@@ -912,7 +912,7 @@ int ubifs_read_node_wbuf(struct ubifs_wbuf *wbuf, void *buf, int type, int len, +@@ -912,7 +912,7 @@ int ubifs_read_node_wbuf(struct ubifs_wb if (!overlap) { /* We may safely unlock the write-buffer and read the data */ spin_unlock(&wbuf->lock); @@ -72,7 +68,7 @@ index e18b988..51c4072 100644 { int err, l; struct ubifs_ch *ch = buf; -@@ -988,30 +989,34 @@ int ubifs_read_node(const struct ubifs_info *c, void *buf, int type, int len, +@@ -988,30 +989,34 @@ int ubifs_read_node(const struct ubifs_i return err; if (type != ch->node_type) { @@ -114,11 +110,9 @@ index e18b988..51c4072 100644 return -EINVAL; } -diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c -index 4c37607..b46847d 100644 --- a/fs/ubifs/sb.c +++ b/fs/ubifs/sb.c -@@ -482,14 +482,15 @@ failed: +@@ -493,14 +493,15 @@ failed: struct ubifs_sb_node *ubifs_read_sb_node(struct ubifs_info *c) { struct ubifs_sb_node *sup; @@ -136,11 +130,9 @@ index 4c37607..b46847d 100644 if (err) { kfree(sup); return ERR_PTR(err); -diff --git a/fs/ubifs/tnc_misc.c b/fs/ubifs/tnc_misc.c -index f6bf899..e128689 100644 --- a/fs/ubifs/tnc_misc.c +++ b/fs/ubifs/tnc_misc.c -@@ -280,7 +280,7 @@ static int read_znode(struct ubifs_info *c, int lnum, int offs, int len, +@@ -280,7 +280,7 @@ static int read_znode(struct ubifs_info if (!idx) return -ENOMEM; @@ -149,7 +141,7 @@ index f6bf899..e128689 100644 if (err < 0) { kfree(idx); return err; -@@ -472,7 +472,7 @@ int ubifs_tnc_read_node(struct ubifs_info *c, struct ubifs_zbranch *zbr, +@@ -472,7 +472,7 @@ int ubifs_tnc_read_node(struct ubifs_inf zbr->lnum, zbr->offs); else err = ubifs_read_node(c, node, type, zbr->len, zbr->lnum, @@ -158,11 +150,9 @@ index f6bf899..e128689 100644 if (err) { dbg_tnck(key, "key "); -diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h -index e8c8cfe..85fdd11 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h -@@ -1481,7 +1481,7 @@ int ubifs_wbuf_write_nolock(struct ubifs_wbuf *wbuf, void *buf, int len); +@@ -1481,7 +1481,7 @@ int ubifs_wbuf_write_nolock(struct ubifs int ubifs_wbuf_seek_nolock(struct ubifs_wbuf *wbuf, int lnum, int offs); int ubifs_wbuf_init(struct ubifs_info *c, struct ubifs_wbuf *wbuf); int ubifs_read_node(const struct ubifs_info *c, void *buf, int type, int len, @@ -171,6 +161,3 @@ index e8c8cfe..85fdd11 100644 int ubifs_read_node_wbuf(struct ubifs_wbuf *wbuf, void *buf, int type, int len, int lnum, int offs); int ubifs_write_node(struct ubifs_info *c, void *node, int len, int lnum, --- -1.9.2 - |