summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.12
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-05-27 20:34:03 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-05-27 20:34:03 +0000
commit2108ca0d9a03d66dd5979fd6a757c1fa23b6ea02 (patch)
treee72c3f572d282aabbad535379361a78b710d4d4b /target/linux/generic/patches-3.12
parent05090cb27006812327b6b4923f06bbbaf1635f8b (diff)
downloadmtk-20170518-2108ca0d9a03d66dd5979fd6a757c1fa23b6ea02.zip
mtk-20170518-2108ca0d9a03d66dd5979fd6a757c1fa23b6ea02.tar.gz
mtk-20170518-2108ca0d9a03d66dd5979fd6a757c1fa23b6ea02.tar.bz2
ubifs: remove obsolete CONFIG_UBIFS_FS_XATTR symbol
550-ubifs-symlink-xattr-support.patch contains a reference to the by now obsolete config symbol CONFIG_UBIFS_FS_XATTR which leads to the functionality originally added by the patch in r30794 being left-out during compile since commit 1bdcc63112a0 ("UBIFS: remove xattr Kconnfig option") in v3.5. Fix this by removing the #ifdef from all affected kernels as XATTR support is now always enabled for UBIFS as well. Signed-off-by: Daniel Golle <daniel@makrotopia.org> SVN-Revision: 40864
Diffstat (limited to 'target/linux/generic/patches-3.12')
-rw-r--r--target/linux/generic/patches-3.12/550-ubifs-symlink-xattr-support.patch4
1 files changed, 1 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.12/550-ubifs-symlink-xattr-support.patch b/target/linux/generic/patches-3.12/550-ubifs-symlink-xattr-support.patch
index f08ec02..9ca8ac1 100644
--- a/target/linux/generic/patches-3.12/550-ubifs-symlink-xattr-support.patch
+++ b/target/linux/generic/patches-3.12/550-ubifs-symlink-xattr-support.patch
@@ -1,15 +1,13 @@
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
-@@ -1577,6 +1577,12 @@ const struct inode_operations ubifs_syml
+@@ -1577,6 +1577,10 @@ const struct inode_operations ubifs_syml
.follow_link = ubifs_follow_link,
.setattr = ubifs_setattr,
.getattr = ubifs_getattr,
-+#ifdef CONFIG_UBIFS_FS_XATTR
+ .setxattr = ubifs_setxattr,
+ .getxattr = ubifs_getxattr,
+ .listxattr = ubifs_listxattr,
+ .removexattr = ubifs_removexattr,
-+#endif
};
const struct file_operations ubifs_file_operations = {