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

diff --git a/target/linux/generic/patches-3.10/550-ubifs-symlink-xattr-support.patch b/target/linux/generic/patches-3.10/550-ubifs-symlink-xattr-support.patch
index b4de071..0235340 100644 (file)
--- a/target/linux/generic/patches-3.10/550-ubifs-symlink-xattr-support.patch
+++ b/target/linux/generic/patches-3.10/550-ubifs-symlink-xattr-support.patch
@@ -1,15 +1,13 @@
 --- a/fs/ubifs/file.c
 +++ b/fs/ubifs/file.c
-@@ -1576,6 +1576,12 @@ const struct inode_operations ubifs_syml
+@@ -1576,6 +1576,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 = {

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 (file)
--- 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 = {

diff --git a/target/linux/generic/patches-3.13/550-ubifs-symlink-xattr-support.patch b/target/linux/generic/patches-3.13/550-ubifs-symlink-xattr-support.patch
index f08ec02..9ca8ac1 100644 (file)
--- a/target/linux/generic/patches-3.13/550-ubifs-symlink-xattr-support.patch
+++ b/target/linux/generic/patches-3.13/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 = {

diff --git a/target/linux/generic/patches-3.14/550-ubifs-symlink-xattr-support.patch b/target/linux/generic/patches-3.14/550-ubifs-symlink-xattr-support.patch
index f08ec02..9ca8ac1 100644 (file)
--- a/target/linux/generic/patches-3.14/550-ubifs-symlink-xattr-support.patch
+++ b/target/linux/generic/patches-3.14/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 = {

diff --git a/target/linux/generic/patches-3.6/550-ubifs-symlink-xattr-support.patch b/target/linux/generic/patches-3.6/550-ubifs-symlink-xattr-support.patch
index 3d49363..d5766b5 100644 (file)
--- a/target/linux/generic/patches-3.6/550-ubifs-symlink-xattr-support.patch
+++ b/target/linux/generic/patches-3.6/550-ubifs-symlink-xattr-support.patch
@@ -1,15 +1,13 @@
 --- a/fs/ubifs/file.c
 +++ b/fs/ubifs/file.c
-@@ -1573,6 +1573,12 @@ 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,
-+#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 = {

diff --git a/target/linux/generic/patches-3.8/550-ubifs-symlink-xattr-support.patch b/target/linux/generic/patches-3.8/550-ubifs-symlink-xattr-support.patch
index 609aca9..61039c0 100644 (file)
--- a/target/linux/generic/patches-3.8/550-ubifs-symlink-xattr-support.patch
+++ b/target/linux/generic/patches-3.8/550-ubifs-symlink-xattr-support.patch
@@ -1,15 +1,13 @@
 --- a/fs/ubifs/file.c
 +++ b/fs/ubifs/file.c
-@@ -1574,6 +1574,12 @@ const struct inode_operations ubifs_syml
+@@ -1574,6 +1574,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 = {

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 b0d818e..8b86cf8 100644 (file)
--- 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 = {