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

Commit 1357d06d authored by Al Viro's avatar Al Viro Committed by Mike Marshall
Browse files

get rid of bufmap argument of orangefs_bufmap_put() 



it's always equal to __orangefs_bufmap and the latter can't change
until we are done

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarMike Marshall <hubcap@omnibond.com>
parent c0eae8cd

fs/orangefs/file.c

+3 −3
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static ssize_t wait_for_direct_io(enum ORANGEFS_io_type type, struct inode *inod 
	 * a new shared memory location.

	 */

	if (ret == -EAGAIN && op_state_purged(new_op)) {

		orangefs_bufmap_put(bufmap, buffer_index);

		orangefs_bufmap_put(buffer_index);

		buffer_index = -1;

		if (type == ORANGEFS_IO_WRITE)

			*iter = saved;
@@ -190,7 +190,7 @@ static ssize_t wait_for_direct_io(enum ORANGEFS_io_type type, struct inode *inod 
		} else {

			complete(&new_op->done);

		}

		orangefs_bufmap_put(bufmap, buffer_index);

		orangefs_bufmap_put(buffer_index);

		buffer_index = -1;

		/*

		 * don't write an error to syslog on signaled operation
@@ -239,7 +239,7 @@ static ssize_t wait_for_direct_io(enum ORANGEFS_io_type type, struct inode *inod 


out:

	if (buffer_index >= 0) {

		orangefs_bufmap_put(bufmap, buffer_index);

		orangefs_bufmap_put(buffer_index);

		gossip_debug(GOSSIP_FILE_DEBUG,

			     "%s(%pU): PUT buffer_index %d\n",

			     __func__, handle, buffer_index);

fs/orangefs/orangefs-bufmap.c

+2 −1
Original line number Diff line number Diff line
@@ -458,9 +458,10 @@ int orangefs_bufmap_get(struct orangefs_bufmap **mapp, int *buffer_index) 
 *

 * no return value

 */

void orangefs_bufmap_put(struct orangefs_bufmap *bufmap, int buffer_index)

void orangefs_bufmap_put(int buffer_index)

{

	struct slot_args slargs;

	struct orangefs_bufmap *bufmap = __orangefs_bufmap;



	slargs.slot_count = bufmap->desc_count;

	slargs.slot_array = bufmap->buffer_index_array;

fs/orangefs/orangefs-bufmap.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ void orangefs_bufmap_finalize(void); 


int orangefs_bufmap_get(struct orangefs_bufmap **mapp, int *buffer_index);



void orangefs_bufmap_put(struct orangefs_bufmap *bufmap, int buffer_index);

void orangefs_bufmap_put(int buffer_index);



int orangefs_readdir_index_get(struct orangefs_bufmap **mapp, int *buffer_index);