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

Commit 87117987 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull exofs update from Boaz Harrosh:
 "Just three one liners"

* 'linux-next' of git://git.open-osd.org/linux-open-osd:
  pnfs_osd_xdr: Remove unused #include from pnfs_osd_xdr.h
  ore: signedness bug in _sp2d_min_pg()
  exofs: check for allocation failure in uri_store()
parents 12197718 7f8d145d

fs/exofs/ore_raid.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static unsigned _sp2d_min_pg(struct __stripe_pages_2d *sp2d) 


static unsigned _sp2d_max_pg(struct __stripe_pages_2d *sp2d)

{

	unsigned p;

	int p;



	for (p = sp2d->pages_in_unit - 1; p >= 0; --p) {

		struct __1_page_stripe *_1ps = &sp2d->_1p_stripes[p];

fs/exofs/sys.c

+6 −1
Original line number Diff line number Diff line
@@ -80,8 +80,13 @@ static ssize_t uri_show(struct exofs_dev *edp, char *buf) 


static ssize_t uri_store(struct exofs_dev *edp, const char *buf, size_t len)

{

	uint8_t *new_uri;



	edp->urilen = strlen(buf) + 1;

	edp->uri = krealloc(edp->uri, edp->urilen, GFP_KERNEL);

	new_uri = krealloc(edp->uri, edp->urilen, GFP_KERNEL);

	if (new_uri == NULL)

		return -ENOMEM;

	edp->uri = new_uri;

	strncpy(edp->uri, buf, edp->urilen);

	return edp->urilen;

}

include/linux/pnfs_osd_xdr.h

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#define __PNFS_OSD_XDR_H__



#include <linux/nfs_fs.h>

#include <linux/nfs_page.h>



/*

 * draft-ietf-nfsv4-minorversion-22