diff options
| -rw-r--r-- | fs/btrfs/compat.h | 25 | ||||
| -rw-r--r-- | fs/btrfs/extent-tree.c | 4 |
2 files changed, 0 insertions, 29 deletions
diff --git a/fs/btrfs/compat.h b/fs/btrfs/compat.h index 594d60bdd3c4..7c4503ef6efd 100644 --- a/fs/btrfs/compat.h +++ b/fs/btrfs/compat.h | |||
| @@ -4,29 +4,4 @@ | |||
| 4 | #define btrfs_drop_nlink(inode) drop_nlink(inode) | 4 | #define btrfs_drop_nlink(inode) drop_nlink(inode) |
| 5 | #define btrfs_inc_nlink(inode) inc_nlink(inode) | 5 | #define btrfs_inc_nlink(inode) inc_nlink(inode) |
| 6 | 6 | ||
| 7 | #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 27) | ||
| 8 | static inline struct dentry *d_obtain_alias(struct inode *inode) | ||
| 9 | { | ||
| 10 | struct dentry *d; | ||
| 11 | |||
| 12 | if (!inode) | ||
| 13 | return NULL; | ||
| 14 | if (IS_ERR(inode)) | ||
| 15 | return ERR_CAST(inode); | ||
| 16 | |||
| 17 | d = d_alloc_anon(inode); | ||
| 18 | if (!d) | ||
| 19 | iput(inode); | ||
| 20 | return d; | ||
| 21 | } | ||
| 22 | #endif | ||
| 23 | |||
| 24 | #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 28) | ||
| 25 | # define __pagevec_lru_add_file __pagevec_lru_add | ||
| 26 | # define open_bdev_exclusive open_bdev_excl | ||
| 27 | # define close_bdev_exclusive(bdev, mode) close_bdev_excl(bdev) | ||
| 28 | typedef unsigned __bitwise__ fmode_t; | ||
| 29 | #endif | ||
| 30 | |||
| 31 | |||
| 32 | #endif /* _COMPAT_H_ */ | 7 | #endif /* _COMPAT_H_ */ |
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index ec43fa526d77..171ca30a3755 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, | |||
| 869 | static void btrfs_issue_discard(struct block_device *bdev, | 869 | static void btrfs_issue_discard(struct block_device *bdev, |
| 870 | u64 start, u64 len) | 870 | u64 start, u64 len) |
| 871 | { | 871 | { |
| 872 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) | ||
| 873 | blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL); | 872 | blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL); |
| 874 | #else | ||
| 875 | blkdev_issue_discard(bdev, start >> 9, len >> 9); | ||
| 876 | #endif | ||
| 877 | } | 873 | } |
| 878 | #endif | 874 | #endif |
| 879 | 875 | ||
