Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 18d18208daced52123de9ba0808447058d3442d8

Authored by Donald Douwsma
Committed by Lachlan McIlroy
1 parent ce46193bca
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[XFS] Fix broken HAVE_SPLICE removal commit. 

Commit e687330b5ed1ea899fdaf0dea50aba196b6e019a was meant to remove the
unused HAVE_SPLICE macro, instead an unrelated change was checked enabling
QUOTADEBUG when building DEBUG XFS. Restore the intended changes.

SGI-PV: 971046
SGI-Modid: xfs-linux-melb:xfs-kern:30924a

Signed-off-by: Donald Douwsma <donaldd@sgi.com>
Signed-off-by: Barry Naujok <bnaujok@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

Showing 2 changed files with 1 additions and 2 deletions Side-by-side Diff

fs/xfs/linux-2.6/xfs_linux.h
Diff comments   View file @ 18d1820
... ... @@ -99,7 +99,6 @@
99 99 /*
100 100 * Feature macros (disable/enable)
101 101 */
102   -#define HAVE_SPLICE /* a splice(2) exists in 2.6, but not in 2.4 */
103 102 #ifdef CONFIG_SMP
104 103 #define HAVE_PERCPU_SB /* per cpu superblock counters are a 2.6 feature */
105 104 #else
... ... @@ -22,7 +22,7 @@
22 22 #define STATIC
23 23 #define DEBUG 1
24 24 #define XFS_BUF_LOCK_TRACKING 1
25   -#define QUOTADEBUG 1
  25 +/* #define QUOTADEBUG 1 */
26 26 #endif
27 27  
28 28 #ifdef CONFIG_XFS_TRACE