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

Commit 8fc8b9df authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

coda: move internal defs out of include/linux/ [ver #2] 

Move include/linux/coda_psdev.h to fs/coda/ as there's nothing else that
uses it.

Link: http://lkml.kernel.org/r/3ceeee0415a929b89fb02700b6b4b3a07938acb8.1558117389.git.jaharkes@cs.cmu.edu
Link: https://patchwork.kernel.org/patch/10590257/


Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarJan Harkes <jaharkes@cs.cmu.edu>
Cc: Yann Droneaud <ydroneaud@opteya.com>
Cc: Jan Harkes <jaharkes@cs.cmu.edu>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Colin Ian King <colin.king@canonical.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Fabian Frederick <fabf@skynet.be>
Cc: Mikko Rapeli <mikko.rapeli@iki.fi>
Cc: Sam Protsenko <semen.protsenko@linaro.org>
Cc: Zhouyang Jia <jiazhouyang09@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b6a18c60

fs/coda/cache.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <linux/spinlock.h>



#include <linux/coda.h>

#include <linux/coda_psdev.h>

#include "coda_psdev.h"

#include "coda_linux.h"

#include "coda_cache.h"

fs/coda/cnode.c

+1 −1
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 
#include <linux/time.h>



#include <linux/coda.h>

#include <linux/coda_psdev.h>

#include <linux/pagemap.h>

#include "coda_psdev.h"

#include "coda_linux.h"



static inline int coda_fideq(struct CodaFid *fid1, struct CodaFid *fid2)

fs/coda/coda_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/string.h>



#include <linux/coda.h>

#include <linux/coda_psdev.h>

#include "coda_psdev.h"

#include "coda_linux.h"



/* initialize the debugging variables */

include/linux/coda_psdev.h→fs/coda/coda_psdev.h

+25 −25
Original line number Diff line number Diff line
@@ -4,21 +4,10 @@ 


#include <linux/backing-dev.h>

#include <linux/mutex.h>

#include <uapi/linux/coda_psdev.h>

#include <linux/coda_psdev.h>



struct kstatfs;



/* communication pending/processing queues */

struct venus_comm {

	u_long		    vc_seq;

	wait_queue_head_t   vc_waitq; /* Venus wait queue */

	struct list_head    vc_pending;

	struct list_head    vc_processing;

	int                 vc_inuse;

	struct super_block *vc_sb;

	struct mutex	    vc_mutex;

};



/* messages between coda filesystem in kernel and Venus */

struct upc_req {

	struct list_head	uc_chain;
@@ -36,6 +25,17 @@ struct upc_req { 
#define CODA_REQ_WRITE  0x4

#define CODA_REQ_ABORT  0x8



/* communication pending/processing queues */

struct venus_comm {

	u_long		    vc_seq;

	wait_queue_head_t   vc_waitq; /* Venus wait queue */

	struct list_head    vc_pending;

	struct list_head    vc_processing;

	int                 vc_inuse;

	struct super_block *vc_sb;

	struct mutex	    vc_mutex;

};



static inline struct venus_comm *coda_vcp(struct super_block *sb)

{

	return (struct venus_comm *)((sb)->s_fs_info);
@@ -65,7 +65,7 @@ int venus_remove(struct super_block *sb, struct CodaFid *dirfid, 
		 const char *name, int length);

int venus_readlink(struct super_block *sb, struct CodaFid *fid,

		   char *buffer, int *length);

int venus_rename(struct super_block *, struct CodaFid *new_fid, 

int venus_rename(struct super_block *sb, struct CodaFid *new_fid,

		 struct CodaFid *old_fid, size_t old_length,

		 size_t new_length, const char *old_name,

		 const char *new_name);

fs/coda/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/uaccess.h>



#include <linux/coda.h>

#include <linux/coda_psdev.h>

#include "coda_psdev.h"

#include "coda_linux.h"

#include "coda_cache.h"