summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2009-01-06 09:38:55 -0500
committerChris Mason <chris.mason@oracle.com>2009-01-06 09:38:55 -0500
commit9ca03b997f71787e345951e6267fbd8eba14d49f (patch)
treef18ecb730a66d542ae1c29e2c3438b78ca40859c /fs/btrfs
parent860a7a0c321ce0267fdb6ebdcd03aa63c5fcb31d (diff)
downloadop-kernel-dev-9ca03b997f71787e345951e6267fbd8eba14d49f.zip
op-kernel-dev-9ca03b997f71787e345951e6267fbd8eba14d49f.tar.gz
Btrfs: drop remaining LINUX_KERNEL_VERSION checks and compat code
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/compat.h25
-rw-r--r--fs/btrfs/extent-tree.c4
2 files changed, 0 insertions, 29 deletions
diff --git a/fs/btrfs/compat.h b/fs/btrfs/compat.h
index 594d60b..7c4503e 100644
--- a/fs/btrfs/compat.h
+++ b/fs/btrfs/compat.h
@@ -4,29 +4,4 @@
#define btrfs_drop_nlink(inode) drop_nlink(inode)
#define btrfs_inc_nlink(inode) inc_nlink(inode)
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 27)
-static inline struct dentry *d_obtain_alias(struct inode *inode)
-{
- struct dentry *d;
-
- if (!inode)
- return NULL;
- if (IS_ERR(inode))
- return ERR_CAST(inode);
-
- d = d_alloc_anon(inode);
- if (!d)
- iput(inode);
- return d;
-}
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 28)
-# define __pagevec_lru_add_file __pagevec_lru_add
-# define open_bdev_exclusive open_bdev_excl
-# define close_bdev_exclusive(bdev, mode) close_bdev_excl(bdev)
-typedef unsigned __bitwise__ fmode_t;
-#endif
-
-
#endif /* _COMPAT_H_ */
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index ec43fa5..171ca30 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -869,11 +869,7 @@ static noinline int remove_extent_backref(struct btrfs_trans_handle *trans,
static void btrfs_issue_discard(struct block_device *bdev,
u64 start, u64 len)
{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL);
-#else
- blkdev_issue_discard(bdev, start >> 9, len >> 9);
-#endif
}
#endif
OpenPOWER on IntegriCloud