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
This commit is contained in:
Felix Fietkau
parent
05090cb270
commit
2108ca0d9a
7 changed files with 7 additions and 21 deletions
|
|
@ -1,15 +1,13 @@
|
||||||
--- a/fs/ubifs/file.c
|
--- a/fs/ubifs/file.c
|
||||||
+++ b/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,
|
.follow_link = ubifs_follow_link,
|
||||||
.setattr = ubifs_setattr,
|
.setattr = ubifs_setattr,
|
||||||
.getattr = ubifs_getattr,
|
.getattr = ubifs_getattr,
|
||||||
+#ifdef CONFIG_UBIFS_FS_XATTR
|
|
||||||
+ .setxattr = ubifs_setxattr,
|
+ .setxattr = ubifs_setxattr,
|
||||||
+ .getxattr = ubifs_getxattr,
|
+ .getxattr = ubifs_getxattr,
|
||||||
+ .listxattr = ubifs_listxattr,
|
+ .listxattr = ubifs_listxattr,
|
||||||
+ .removexattr = ubifs_removexattr,
|
+ .removexattr = ubifs_removexattr,
|
||||||
+#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const struct file_operations ubifs_file_operations = {
|
const struct file_operations ubifs_file_operations = {
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,13 @@
|
||||||
--- a/fs/ubifs/file.c
|
--- a/fs/ubifs/file.c
|
||||||
+++ b/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,
|
.follow_link = ubifs_follow_link,
|
||||||
.setattr = ubifs_setattr,
|
.setattr = ubifs_setattr,
|
||||||
.getattr = ubifs_getattr,
|
.getattr = ubifs_getattr,
|
||||||
+#ifdef CONFIG_UBIFS_FS_XATTR
|
|
||||||
+ .setxattr = ubifs_setxattr,
|
+ .setxattr = ubifs_setxattr,
|
||||||
+ .getxattr = ubifs_getxattr,
|
+ .getxattr = ubifs_getxattr,
|
||||||
+ .listxattr = ubifs_listxattr,
|
+ .listxattr = ubifs_listxattr,
|
||||||
+ .removexattr = ubifs_removexattr,
|
+ .removexattr = ubifs_removexattr,
|
||||||
+#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const struct file_operations ubifs_file_operations = {
|
const struct file_operations ubifs_file_operations = {
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,13 @@
|
||||||
--- a/fs/ubifs/file.c
|
--- a/fs/ubifs/file.c
|
||||||
+++ b/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,
|
.follow_link = ubifs_follow_link,
|
||||||
.setattr = ubifs_setattr,
|
.setattr = ubifs_setattr,
|
||||||
.getattr = ubifs_getattr,
|
.getattr = ubifs_getattr,
|
||||||
+#ifdef CONFIG_UBIFS_FS_XATTR
|
|
||||||
+ .setxattr = ubifs_setxattr,
|
+ .setxattr = ubifs_setxattr,
|
||||||
+ .getxattr = ubifs_getxattr,
|
+ .getxattr = ubifs_getxattr,
|
||||||
+ .listxattr = ubifs_listxattr,
|
+ .listxattr = ubifs_listxattr,
|
||||||
+ .removexattr = ubifs_removexattr,
|
+ .removexattr = ubifs_removexattr,
|
||||||
+#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const struct file_operations ubifs_file_operations = {
|
const struct file_operations ubifs_file_operations = {
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,13 @@
|
||||||
--- a/fs/ubifs/file.c
|
--- a/fs/ubifs/file.c
|
||||||
+++ b/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,
|
.follow_link = ubifs_follow_link,
|
||||||
.setattr = ubifs_setattr,
|
.setattr = ubifs_setattr,
|
||||||
.getattr = ubifs_getattr,
|
.getattr = ubifs_getattr,
|
||||||
+#ifdef CONFIG_UBIFS_FS_XATTR
|
|
||||||
+ .setxattr = ubifs_setxattr,
|
+ .setxattr = ubifs_setxattr,
|
||||||
+ .getxattr = ubifs_getxattr,
|
+ .getxattr = ubifs_getxattr,
|
||||||
+ .listxattr = ubifs_listxattr,
|
+ .listxattr = ubifs_listxattr,
|
||||||
+ .removexattr = ubifs_removexattr,
|
+ .removexattr = ubifs_removexattr,
|
||||||
+#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const struct file_operations ubifs_file_operations = {
|
const struct file_operations ubifs_file_operations = {
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,13 @@
|
||||||
--- a/fs/ubifs/file.c
|
--- a/fs/ubifs/file.c
|
||||||
+++ b/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,
|
.follow_link = ubifs_follow_link,
|
||||||
.setattr = ubifs_setattr,
|
.setattr = ubifs_setattr,
|
||||||
.getattr = ubifs_getattr,
|
.getattr = ubifs_getattr,
|
||||||
+#ifdef CONFIG_UBIFS_FS_XATTR
|
|
||||||
+ .setxattr = ubifs_setxattr,
|
+ .setxattr = ubifs_setxattr,
|
||||||
+ .getxattr = ubifs_getxattr,
|
+ .getxattr = ubifs_getxattr,
|
||||||
+ .listxattr = ubifs_listxattr,
|
+ .listxattr = ubifs_listxattr,
|
||||||
+ .removexattr = ubifs_removexattr,
|
+ .removexattr = ubifs_removexattr,
|
||||||
+#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const struct file_operations ubifs_file_operations = {
|
const struct file_operations ubifs_file_operations = {
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,13 @@
|
||||||
--- a/fs/ubifs/file.c
|
--- a/fs/ubifs/file.c
|
||||||
+++ b/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,
|
.follow_link = ubifs_follow_link,
|
||||||
.setattr = ubifs_setattr,
|
.setattr = ubifs_setattr,
|
||||||
.getattr = ubifs_getattr,
|
.getattr = ubifs_getattr,
|
||||||
+#ifdef CONFIG_UBIFS_FS_XATTR
|
|
||||||
+ .setxattr = ubifs_setxattr,
|
+ .setxattr = ubifs_setxattr,
|
||||||
+ .getxattr = ubifs_getxattr,
|
+ .getxattr = ubifs_getxattr,
|
||||||
+ .listxattr = ubifs_listxattr,
|
+ .listxattr = ubifs_listxattr,
|
||||||
+ .removexattr = ubifs_removexattr,
|
+ .removexattr = ubifs_removexattr,
|
||||||
+#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const struct file_operations ubifs_file_operations = {
|
const struct file_operations ubifs_file_operations = {
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,13 @@
|
||||||
--- a/fs/ubifs/file.c
|
--- a/fs/ubifs/file.c
|
||||||
+++ b/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,
|
.follow_link = ubifs_follow_link,
|
||||||
.setattr = ubifs_setattr,
|
.setattr = ubifs_setattr,
|
||||||
.getattr = ubifs_getattr,
|
.getattr = ubifs_getattr,
|
||||||
+#ifdef CONFIG_UBIFS_FS_XATTR
|
|
||||||
+ .setxattr = ubifs_setxattr,
|
+ .setxattr = ubifs_setxattr,
|
||||||
+ .getxattr = ubifs_getxattr,
|
+ .getxattr = ubifs_getxattr,
|
||||||
+ .listxattr = ubifs_listxattr,
|
+ .listxattr = ubifs_listxattr,
|
||||||
+ .removexattr = ubifs_removexattr,
|
+ .removexattr = ubifs_removexattr,
|
||||||
+#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const struct file_operations ubifs_file_operations = {
|
const struct file_operations ubifs_file_operations = {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue