projects / openwrt / staging / dedeckeh.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 05090cb)
ubifs: remove obsolete CONFIG_UBIFS_FS_XATTR symbol
authorFelix Fietkau <nbd@openwrt.org>
Tue, 27 May 2014 20:34:03 +0000 (20:34 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Tue, 27 May 2014 20:34:03 +0000 (20:34 +0000)
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

target/linux/generic/patches-3.10/550-ubifs-symlink-xattr-support.patch patch | blob | history
target/linux/generic/patches-3.12/550-ubifs-symlink-xattr-support.patch patch | blob | history
target/linux/generic/patches-3.13/550-ubifs-symlink-xattr-support.patch patch | blob | history
target/linux/generic/patches-3.14/550-ubifs-symlink-xattr-support.patch patch | blob | history
target/linux/generic/patches-3.6/550-ubifs-symlink-xattr-support.patch patch | blob | history
target/linux/generic/patches-3.8/550-ubifs-symlink-xattr-support.patch patch | blob | history
target/linux/generic/patches-3.9/550-ubifs-symlink-xattr-support.patch patch | blob | history

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 b4de071f76b7cf2da01703b2297d4e158ad1c561..0235340aa875b943c8566588f633f06191344e00 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 f08ec029590b74c5c533f912cdd1bb8bb7683836..9ca8ac140942a1d0f15ed587fdd76f254e631e50 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 f08ec029590b74c5c533f912cdd1bb8bb7683836..9ca8ac140942a1d0f15ed587fdd76f254e631e50 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 f08ec029590b74c5c533f912cdd1bb8bb7683836..9ca8ac140942a1d0f15ed587fdd76f254e631e50 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 3d4936318689bb06b7ea46350156e6af37bc5b77..d5766b5e50dfae1713dc07ea65de1db7e48c1281 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 609aca9994b5b446c8c580688f773ee22e11fd2b..61039c025f5b7f20b40c9cd16018a11e5bd7b520 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 b0d818e8df5dd788e4217116c8e5ffeab40cb5da..8b86cf8641c0afb4dbc6fbd2288196eb50b0963a 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 = {
Staging tree of dedeckeh