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

Commit 54804949 authored by Mike Marshall's avatar Mike Marshall
Browse files

Orangefs: fix some checkpatch.pl complaints that had creeped in. 



Signed-off-by: default avatarMike Marshall <hubcap@omnibond.com>
parent 894ac432

fs/orangefs/devpvfs2-req.c

+3 −3
Original line number Diff line number Diff line
@@ -476,9 +476,9 @@ static ssize_t pvfs2_devreq_writev(struct file *file, 
			set_op_state_serviced(op);

			spin_unlock(&op->lock);

			/*

			   for every other operation (i.e. non-I/O), we need to

			   wake up the callers for downcall completion

			   notification

			 * for every other operation (i.e. non-I/O), we need to

			 * wake up the callers for downcall completion

			 * notification

			 */

			wake_up_interruptible(&op->waitq);

		}

fs/orangefs/file.c

+12 −13
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ static int precopy_buffers(struct pvfs2_bufmap *bufmap, 
		gossip_err("%s: Failed to copy-in buffers. Please make sure that the pvfs2-client is running. %ld\n",

			   __func__,

			   (long)ret);

		

	}



	if (ret < 0)
@@ -199,9 +198,9 @@ static ssize_t wait_for_direct_io(enum PVFS_io_type type, struct inode *inode, 
	if (ret < 0) {

		handle_io_error(); /* defined in pvfs2-kernel.h */

		/*

		   don't write an error to syslog on signaled operation

		   termination unless we've got debugging turned on, as

		   this can happen regularly (i.e. ctrl-c)

		 * don't write an error to syslog on signaled operation

		 * termination unless we've got debugging turned on, as

		 * this can happen regularly (i.e. ctrl-c)

		 */

		if (ret == -EINTR)

			gossip_debug(GOSSIP_FILE_DEBUG,
@@ -245,10 +244,10 @@ static ssize_t wait_for_direct_io(enum PVFS_io_type type, struct inode *inode, 
	ret = new_op->downcall.resp.io.amt_complete;



	/*

	   tell the device file owner waiting on I/O that this read has

	   completed and it can return now.  in this exact case, on

	   wakeup the daemon will free the op, so we *cannot* touch it

	   after this.

	 * tell the device file owner waiting on I/O that this read has

	 * completed and it can return now.  in this exact case, on

	 * wakeup the daemon will free the op, so we *cannot* touch it

	 * after this.

	 */

	wake_up_daemon_for_return(new_op);

	new_op = NULL;
@@ -875,9 +874,9 @@ static int pvfs2_file_release(struct inode *inode, struct file *file) 
	pvfs2_flush_inode(inode);



	/*

	   remove all associated inode pages from the page cache and mmap

	   readahead cache (if any); this forces an expensive refresh of

	   data for the next caller of mmap (or 'get_block' accesses)

	 * remove all associated inode pages from the page cache and mmap

	 * readahead cache (if any); this forces an expensive refresh of

	 * data for the next caller of mmap (or 'get_block' accesses)

	 */

	if (file->f_path.dentry->d_inode &&

	    file->f_path.dentry->d_inode->i_mapping &&
@@ -960,8 +959,8 @@ static loff_t pvfs2_file_llseek(struct file *file, loff_t offset, int origin) 
	}



	gossip_debug(GOSSIP_FILE_DEBUG,

		     "pvfs2_file_llseek: offset is %ld | origin is %d | "

		     "inode size is %lu\n",

		     "pvfs2_file_llseek: offset is %ld | origin is %d"

		     " | inode size is %lu\n",

		     (long)offset,

		     origin,

		     (unsigned long)file->f_path.dentry->d_inode->i_size);

fs/orangefs/inode.c

+12 −12
Original line number Diff line number Diff line
@@ -128,17 +128,17 @@ static int pvfs2_releasepage(struct page *page, gfp_t foo) 
 * AIO. Modeled after NFS, they do this too.

 */

/*

static ssize_t pvfs2_direct_IO(int rw,

			struct kiocb *iocb,

			struct iov_iter *iter,

			loff_t offset)

{

	gossip_debug(GOSSIP_INODE_DEBUG,

		     "pvfs2_direct_IO: %s\n",

		     iocb->ki_filp->f_path.dentry->d_name.name);



	return -EINVAL;

}

 * static ssize_t pvfs2_direct_IO(int rw,

 *			struct kiocb *iocb,

 *			struct iov_iter *iter,

 *			loff_t offset)

 *{

 *	gossip_debug(GOSSIP_INODE_DEBUG,

 *		     "pvfs2_direct_IO: %s\n",

 *		     iocb->ki_filp->f_path.dentry->d_name.name);

 *

 *	return -EINVAL;

 *}

 */



struct backing_dev_info pvfs2_backing_dev_info = {

fs/orangefs/protocol.h

+17 −15
Original line number Diff line number Diff line
@@ -101,22 +101,30 @@ typedef __s64 PVFS_offset; 


#define PVFS2_SUPER_MAGIC 0x20030528



/* PVFS2 error codes are a signed 32-bit integer. Error codes are negative, but

 * the sign is stripped before decoding. */

/*

 * PVFS2 error codes are a signed 32-bit integer. Error codes are negative, but

 * the sign is stripped before decoding.

 */



/* Bit 31 is not used since it is the sign. */



/* Bit 30 specifies that this is a PVFS2 error. A PVFS2 error is either an

 * encoded errno value or a PVFS2 protocol error. */

/*

 * Bit 30 specifies that this is a PVFS2 error. A PVFS2 error is either an

 * encoded errno value or a PVFS2 protocol error.

 */

#define PVFS_ERROR_BIT (1 << 30)



/* Bit 29 specifies that this is a PVFS2 protocol error and not an encoded

 * errno value. */

/*

 * Bit 29 specifies that this is a PVFS2 protocol error and not an encoded

 * errno value.

 */

#define PVFS_NON_ERRNO_ERROR_BIT (1 << 29)



/* Bits 9, 8, and 7 specify the error class, which encodes the section of

/*

 * Bits 9, 8, and 7 specify the error class, which encodes the section of

 * server code the error originated in for logging purposes. It is not used

 * in the kernel except to be masked out. */

 * in the kernel except to be masked out.

 */

#define PVFS_ERROR_CLASS_BITS 0x380



/* Bits 6 - 0 are reserved for the actual error code. */
@@ -388,13 +396,7 @@ enum { 


/*

 * version number for use in communicating between kernel space and user

 * space

 */

/*

#define PVFS_KERNEL_PROTO_VERSION			\

		((PVFS2_VERSION_MAJOR * 10000)	+	\

		 (PVFS2_VERSION_MINOR * 100)	+	\

		 PVFS2_VERSION_SUB)

 * space. Zero signifies the upstream version of the kernel module.

 */

#define PVFS_KERNEL_PROTO_VERSION 0

fs/orangefs/pvfs2-debug.h

+4 −2
Original line number Diff line number Diff line
@@ -180,8 +180,10 @@ static struct __keyword_mask_s s_keyword_mask_map[] = { 
	{"readdir", GOSSIP_READDIR_DEBUG},

	/* Debug the mkdir operation (server only) */

	{"mkdir", GOSSIP_MKDIR_DEBUG},

	/* Debug the io operation (reads and writes)

	 * for both the client and server */

	/*

	 * Debug the io operation (reads and writes)

	 * for both the client and server.

	 */

	{"io", GOSSIP_IO_DEBUG},

	/* Debug the server's open file descriptor cache */

	{"open_cache", GOSSIP_DBPF_OPEN_CACHE_DEBUG},