aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/linux-2.6/xfs_linux.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-02 13:11:25 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-02 13:11:25 -0700
commita2308b7f0838406c346a2b0259ff88c7fcf41e79 (patch)
treef0d6e3d05d301d3aadb7e8bdd42083be98e29e0d /fs/xfs/linux-2.6/xfs_linux.h
parentf27f0a045b79de5729d064497e21a70871f1d6fe (diff)
parent1b895840ce93fd2d150a86c800a3085eaab4eb9e (diff)
downloadkernel_samsung_smdk4412-a2308b7f0838406c346a2b0259ff88c7fcf41e79.zip
kernel_samsung_smdk4412-a2308b7f0838406c346a2b0259ff88c7fcf41e79.tar.gz
kernel_samsung_smdk4412-a2308b7f0838406c346a2b0259ff88c7fcf41e79.tar.bz2
Merge git://oss.sgi.com:8090/oss/git/xfs-2.6
* git://oss.sgi.com:8090/oss/git/xfs-2.6: [XFS] Provide XFS support for the splice syscall. [XFS] Reenable write barriers by default. [XFS] Make project quota enforcement return an error code consistent with [XFS] Implement the silent parameter to fill_super, previously ignored. [XFS] Cleanup comment to remove reference to obsoleted function
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_linux.h')
-rw-r--r--fs/xfs/linux-2.6/xfs_linux.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/xfs/linux-2.6/xfs_linux.h b/fs/xfs/linux-2.6/xfs_linux.h
index 1fe09f2..e9fe43d 100644
--- a/fs/xfs/linux-2.6/xfs_linux.h
+++ b/fs/xfs/linux-2.6/xfs_linux.h
@@ -103,6 +103,7 @@
*/
#undef HAVE_REFCACHE /* reference cache not needed for NFS in 2.6 */
#define HAVE_SENDFILE /* sendfile(2) exists in 2.6, but not in 2.4 */
+#define HAVE_SPLICE /* a splice(2) exists in 2.6, but not in 2.4 */
#ifdef CONFIG_SMP
#define HAVE_PERCPU_SB /* per cpu superblock counters are a 2.6 feature */
#else