aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/550-ubifs-symlink-xattr-support.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-10-27 22:55:39 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-10-27 22:55:39 +0000
commit2644af4717cf9cc3cf89564ca017f596a7dcad05 (patch)
tree7f2121f700446e60159a365094fdc6eea16d5cb7 /target/linux/generic/patches-3.18/550-ubifs-symlink-xattr-support.patch
parent5e558fcd48c8c4acb87fe7bcf3eb2a66bb279503 (diff)
downloadmaster-187ad058-2644af4717cf9cc3cf89564ca017f596a7dcad05.tar.gz
master-187ad058-2644af4717cf9cc3cf89564ca017f596a7dcad05.tar.bz2
master-187ad058-2644af4717cf9cc3cf89564ca017f596a7dcad05.zip
kernel: make the kernel 3.18 patches apply and boot on arm.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43095 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/550-ubifs-symlink-xattr-support.patch')
-rw-r--r--target/linux/generic/patches-3.18/550-ubifs-symlink-xattr-support.patch22
1 files changed, 6 insertions, 16 deletions
diff --git a/target/linux/generic/patches-3.18/550-ubifs-symlink-xattr-support.patch b/target/linux/generic/patches-3.18/550-ubifs-symlink-xattr-support.patch
index 0235340aa8..d3f2ccca36 100644
--- a/target/linux/generic/patches-3.18/550-ubifs-symlink-xattr-support.patch
+++ b/target/linux/generic/patches-3.18/550-ubifs-symlink-xattr-support.patch
@@ -1,6 +1,6 @@
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
-@@ -1576,6 +1576,10 @@ const struct inode_operations ubifs_syml
+@@ -1573,6 +1573,10 @@ const struct inode_operations ubifs_syml
.follow_link = ubifs_follow_link,
.setattr = ubifs_setattr,
.getattr = ubifs_getattr,
@@ -13,37 +13,27 @@
const struct file_operations ubifs_file_operations = {
--- a/fs/ubifs/journal.c
+++ b/fs/ubifs/journal.c
-@@ -553,7 +553,8 @@ int ubifs_jnl_update(struct ubifs_info *
-
- dbg_jnl("ino %lu, dent '%.*s', data len %d in dir ino %lu",
- inode->i_ino, nm->len, nm->name, ui->data_len, dir->i_ino);
-- ubifs_assert(dir_ui->data_len == 0);
-+ if (!xent)
-+ ubifs_assert(dir_ui->data_len == 0);
- ubifs_assert(mutex_is_locked(&dir_ui->ui_mutex));
-
- dlen = UBIFS_DENT_NODE_SZ + nm->len + 1;
-@@ -573,6 +574,13 @@ int ubifs_jnl_update(struct ubifs_info *
+@@ -572,6 +572,13 @@ int ubifs_jnl_update(struct ubifs_info *
aligned_dlen = ALIGN(dlen, 8);
aligned_ilen = ALIGN(ilen, 8);
len = aligned_dlen + aligned_ilen + UBIFS_INO_NODE_SZ;
+ if (xent) {
+ /*
-+ * Make sure to account for dir_ui->data_len in
++ * Make sure to account for host_ui->data_len in
+ * length calculation in case there is extended attribute.
+ */
-+ len += dir_ui->data_len;
++ len += host_ui->data_len;
+ }
dent = kmalloc(len, GFP_NOFS);
if (!dent)
return -ENOMEM;
-@@ -649,7 +657,8 @@ int ubifs_jnl_update(struct ubifs_info *
+@@ -648,7 +655,8 @@ int ubifs_jnl_update(struct ubifs_info *
ino_key_init(c, &ino_key, dir->i_ino);
ino_offs += aligned_ilen;
- err = ubifs_tnc_add(c, &ino_key, lnum, ino_offs, UBIFS_INO_NODE_SZ);
+ err = ubifs_tnc_add(c, &ino_key, lnum, ino_offs,
-+ UBIFS_INO_NODE_SZ + dir_ui->data_len);
++ UBIFS_INO_NODE_SZ + host_ui->data_len);
if (err)
goto out_ro;