From 04e1b79564711d75726f028d1c3eb8ade4cc2713 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 27 May 2014 20:34:03 +0000 Subject: 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40864 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/generic/patches-3.14/550-ubifs-symlink-xattr-support.patch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'target/linux/generic/patches-3.14/550-ubifs-symlink-xattr-support.patch') 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 = { -- cgit v1.2.3