diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-05-27 20:34:03 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-05-27 20:34:03 +0000 |
| commit | 04e1b79564711d75726f028d1c3eb8ade4cc2713 (patch) | |
| tree | 788be8c24595aecfb53fdb3b06bf6af6196ff4e7 /target/linux | |
| parent | 1ee0b0a2ab93c2a26c70539f7992c7d8bff2ace4 (diff) | |
| download | master-187ad058-04e1b79564711d75726f028d1c3eb8ade4cc2713.tar.gz master-187ad058-04e1b79564711d75726f028d1c3eb8ade4cc2713.tar.bz2 master-187ad058-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')
7 files changed, 7 insertions, 21 deletions
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 b4de071f76..0235340aa8 100644 --- 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 f08ec02959..9ca8ac1409 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 = { 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 f08ec02959..9ca8ac1409 100644 --- 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 f08ec02959..9ca8ac1409 100644 --- 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 3d49363186..d5766b5e50 100644 --- 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 609aca9994..61039c025f 100644 --- 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 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 = { |