aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.9
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
commit04e1b79564711d75726f028d1c3eb8ade4cc2713 (patch)
tree788be8c24595aecfb53fdb3b06bf6af6196ff4e7 /target/linux/generic/patches-3.9
parent1ee0b0a2ab93c2a26c70539f7992c7d8bff2ace4 (diff)
downloadupstream-04e1b79564711d75726f028d1c3eb8ade4cc2713.tar.gz
upstream-04e1b79564711d75726f028d1c3eb8ade4cc2713.tar.bz2
upstream-04e1b79564711d75726f028d1c3eb8ade4cc2713.zip
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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40864 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.9')
-rw-r--r--target/linux/generic/patches-3.9/550-ubifs-symlink-xattr-support.patch4
1 files changed, 1 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.9/550-ubifs-symlink-xattr-support.patch b/target/linux/generic/patches-3.9/550-ubifs-symlink-xattr-support.patch
index b0d818e8df..8b86cf8641 100644
--- a/target/linux/generic/patches-3.9/550-ubifs-symlink-xattr-support.patch
+++ b/target/linux/generic/patches-3.9/550-ubifs-symlink-xattr-support.patch
@@ -1,15 +1,13 @@
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
-@@ -1575,6 +1575,12 @@ const struct inode_operations ubifs_syml
+@@ -1575,6 +1575,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 = {