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

Commit 9e897e13 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd 

Pull exofs updates from Boaz Harrosh:
 "Trivial updates to exofs for 3.15-rc1

  Just a few fixes sent by people"

* 'for-linus' of git://git.open-osd.org/linux-open-osd:
  MAINTAINERS: Update email address for bhalevy
  fs: Mark functions as static in exofs/ore_raid.c
  fs: Mark function as static in exofs/super.c
parents 4ba85265 f1f6630b

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6543,7 +6543,7 @@ F: drivers/net/wireless/orinoco/ 


OSD LIBRARY and FILESYSTEM

M:	Boaz Harrosh <bharrosh@panasas.com>

M:	Benny Halevy <bhalevy@tonian.com>

M:	Benny Halevy <bhalevy@primarydata.com>

L:	osd-dev@open-osd.org

W:	http://open-osd.org

T:	git git://git.open-osd.org/open-osd.git

fs/exofs/ore_raid.c

+2 −2
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@ 
#undef ORE_DBGMSG2

#define ORE_DBGMSG2 ORE_DBGMSG



struct page *_raid_page_alloc(void)

static struct page *_raid_page_alloc(void)

{

	return alloc_page(GFP_KERNEL);

}



void _raid_page_free(struct page *p)

static void _raid_page_free(struct page *p)

{

	__free_page(p);

}

fs/exofs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ static int exofs_devs_2_odi(struct exofs_dt_device_info *dt_dev, 
	return !(odi->systemid_len || odi->osdname_len);

}



int __alloc_dev_table(struct exofs_sb_info *sbi, unsigned numdevs,

static int __alloc_dev_table(struct exofs_sb_info *sbi, unsigned numdevs,

		      struct exofs_dev **peds)

{

	struct __alloc_ore_devs_and_exofs_devs {