Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b4e25f2 authored by Chris Mason's avatar Chris Mason
Browse files

Btrfs: compat code fixes 



The btrfs git kernel trees is used to build a standalone tree for
compiling against older kernels.  This commit makes the standalone tree
work with 2.6.27

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 79683f2d

fs/btrfs/compat.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ static inline struct dentry *d_obtain_alias(struct inode *inode) 
# define  __pagevec_lru_add_file __pagevec_lru_add

# define  __pagevec_lru_add_file __pagevec_lru_add

# define open_bdev_exclusive open_bdev_excl

# define open_bdev_exclusive open_bdev_excl

# define close_bdev_exclusive(bdev, mode) close_bdev_excl(bdev)

# define close_bdev_exclusive(bdev, mode) close_bdev_excl(bdev)

typedef unsigned __bitwise__ fmode_t;

#endif

#endif

fs/btrfs/compression.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -34,13 +34,13 @@ 
#include <linux/bit_spinlock.h>

#include <linux/bit_spinlock.h>

#include <linux/version.h>

#include <linux/version.h>

#include <linux/pagevec.h>

#include <linux/pagevec.h>

#include "compat.h"

#include "ctree.h"

#include "ctree.h"

#include "disk-io.h"

#include "disk-io.h"

#include "transaction.h"

#include "transaction.h"

#include "btrfs_inode.h"

#include "btrfs_inode.h"

#include "volumes.h"

#include "volumes.h"

#include "ordered-data.h"

#include "ordered-data.h"

#include "compat.h"

#include "compression.h"

#include "compression.h"

#include "extent_io.h"

#include "extent_io.h"

#include "extent_map.h"

#include "extent_map.h"

fs/btrfs/disk-io.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/workqueue.h>

#include <linux/workqueue.h>

#include <linux/kthread.h>

#include <linux/kthread.h>

#include <linux/freezer.h>

#include <linux/freezer.h>

#include "compat.h"

#include "crc32c.h"

#include "crc32c.h"

#include "ctree.h"

#include "ctree.h"

#include "disk-io.h"

#include "disk-io.h"

fs/btrfs/extent-tree.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -19,6 +19,8 @@ 
#include <linux/pagemap.h>

#include <linux/pagemap.h>

#include <linux/writeback.h>

#include <linux/writeback.h>

#include <linux/blkdev.h>

#include <linux/blkdev.h>

#include <linux/version.h>

#include "compat.h"

#include "hash.h"

#include "hash.h"

#include "crc32c.h"

#include "crc32c.h"

#include "ctree.h"

#include "ctree.h"
@@ -900,6 +902,7 @@ static int noinline remove_extent_backref(struct btrfs_trans_handle *trans, 
	return ret;

	return ret;

}

}





#ifdef BIO_RW_DISCARD

static void btrfs_issue_discard(struct block_device *bdev,

static void btrfs_issue_discard(struct block_device *bdev,

				u64 start, u64 len)

				u64 start, u64 len)

{

{
@@ -909,7 +912,7 @@ static void btrfs_issue_discard(struct block_device *bdev, 
	blkdev_issue_discard(bdev, start >> 9, len >> 9);

	blkdev_issue_discard(bdev, start >> 9, len >> 9);

#endif

#endif

}

}



#endif





static int noinline free_extents(struct btrfs_trans_handle *trans,

static int noinline free_extents(struct btrfs_trans_handle *trans,

				 struct btrfs_root *extent_root,

				 struct btrfs_root *extent_root,

fs/btrfs/inode.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <linux/xattr.h>

#include <linux/xattr.h>

#include <linux/posix_acl.h>

#include <linux/posix_acl.h>

#include <linux/falloc.h>

#include <linux/falloc.h>

#include "compat.h"

#include "ctree.h"

#include "ctree.h"

#include "disk-io.h"

#include "disk-io.h"

#include "transaction.h"

#include "transaction.h"
@@ -47,7 +48,6 @@ 
#include "volumes.h"

#include "volumes.h"

#include "ordered-data.h"

#include "ordered-data.h"

#include "xattr.h"

#include "xattr.h"

#include "compat.h"

#include "tree-log.h"

#include "tree-log.h"

#include "ref-cache.h"

#include "ref-cache.h"

#include "compression.h"

#include "compression.h"