leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: David Howells <dhowells@redhat.com>
Signed-off-by: Jan 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
David Howells 2019-07-16 16:28:47 -07:00 committed by Linus Torvalds
parent b6a18c6008
commit 8fc8b9df83
11 changed files with 35 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/coda/cache.c
View File

@ -21,7 +21,7 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/coda.h> #include <linux/coda.h>
#include <linux/coda_psdev.h> #include "coda_psdev.h"
#include "coda_linux.h" #include "coda_linux.h"
#include "coda_cache.h" #include "coda_cache.h"

2
fs/coda/cnode.c
View File

@ -8,8 +8,8 @@
#include <linux/time.h> #include <linux/time.h>
#include <linux/coda.h> #include <linux/coda.h>
#include <linux/coda_psdev.h>
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include "coda_psdev.h"
#include "coda_linux.h" #include "coda_linux.h"
static inline int coda_fideq(struct CodaFid *fid1, struct CodaFid *fid2) static inline int coda_fideq(struct CodaFid *fid1, struct CodaFid *fid2)

2
fs/coda/coda_linux.c
View File

@ -18,7 +18,7 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/coda.h> #include <linux/coda.h>
#include <linux/coda_psdev.h> #include "coda_psdev.h"
#include "coda_linux.h" #include "coda_linux.h"
/* initialize the debugging variables */ /* initialize the debugging variables */

50
include/linux/coda_psdev.h → fs/coda/coda_psdev.h
View File

@ -4,21 +4,10 @@
#include <linux/backing-dev.h> #include <linux/backing-dev.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <uapi/linux/coda_psdev.h> #include <linux/coda_psdev.h>
struct kstatfs; 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 */ /* messages between coda filesystem in kernel and Venus */
struct upc_req { struct upc_req {
struct list_head uc_chain; struct list_head uc_chain;
@ -36,6 +25,17 @@ struct upc_req {
#define CODA_REQ_WRITE 0x4 #define CODA_REQ_WRITE 0x4
#define CODA_REQ_ABORT 0x8 #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) static inline struct venus_comm *coda_vcp(struct super_block *sb)
{ {
return (struct venus_comm *)((sb)->s_fs_info); return (struct venus_comm *)((sb)->s_fs_info);
@ -46,30 +46,30 @@ int venus_rootfid(struct super_block *sb, struct CodaFid *fidp);
int venus_getattr(struct super_block *sb, struct CodaFid *fid, int venus_getattr(struct super_block *sb, struct CodaFid *fid,
struct coda_vattr *attr); struct coda_vattr *attr);
int venus_setattr(struct super_block *, struct CodaFid *, struct coda_vattr *); int venus_setattr(struct super_block *, struct CodaFid *, struct coda_vattr *);
int venus_lookup(struct super_block *sb, struct CodaFid *fid, int venus_lookup(struct super_block *sb, struct CodaFid *fid,
const char *name, int length, int *type, const char *name, int length, int *type,
struct CodaFid *resfid); struct CodaFid *resfid);
int venus_close(struct super_block *sb, struct CodaFid *fid, int flags, int venus_close(struct super_block *sb, struct CodaFid *fid, int flags,
kuid_t uid); kuid_t uid);
int venus_open(struct super_block *sb, struct CodaFid *fid, int flags, int venus_open(struct super_block *sb, struct CodaFid *fid, int flags,
struct file **f); struct file **f);
int venus_mkdir(struct super_block *sb, struct CodaFid *dirfid, int venus_mkdir(struct super_block *sb, struct CodaFid *dirfid,
const char *name, int length, const char *name, int length,
struct CodaFid *newfid, struct coda_vattr *attrs); struct CodaFid *newfid, struct coda_vattr *attrs);
int venus_create(struct super_block *sb, struct CodaFid *dirfid, int venus_create(struct super_block *sb, struct CodaFid *dirfid,
const char *name, int length, int excl, int mode, const char *name, int length, int excl, int mode,
struct CodaFid *newfid, struct coda_vattr *attrs) ; struct CodaFid *newfid, struct coda_vattr *attrs);
int venus_rmdir(struct super_block *sb, struct CodaFid *dirfid, int venus_rmdir(struct super_block *sb, struct CodaFid *dirfid,
const char *name, int length); const char *name, int length);
int venus_remove(struct super_block *sb, struct CodaFid *dirfid, int venus_remove(struct super_block *sb, struct CodaFid *dirfid,
const char *name, int length); const char *name, int length);
int venus_readlink(struct super_block *sb, struct CodaFid *fid, int venus_readlink(struct super_block *sb, struct CodaFid *fid,
char *buffer, int *length); 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, struct CodaFid *old_fid, size_t old_length,
size_t new_length, const char *old_name, size_t new_length, const char *old_name,
const char *new_name); const char *new_name);
int venus_link(struct super_block *sb, struct CodaFid *fid, int venus_link(struct super_block *sb, struct CodaFid *fid,
struct CodaFid *dirfid, const char *name, int len ); struct CodaFid *dirfid, const char *name, int len );
int venus_symlink(struct super_block *sb, struct CodaFid *fid, int venus_symlink(struct super_block *sb, struct CodaFid *fid,
const char *name, int len, const char *symname, int symlen); const char *name, int len, const char *symname, int symlen);

2
fs/coda/dir.c
View File

@ -23,7 +23,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/coda.h> #include <linux/coda.h>
#include <linux/coda_psdev.h> #include "coda_psdev.h"
#include "coda_linux.h" #include "coda_linux.h"
#include "coda_cache.h" #include "coda_cache.h"

3
fs/coda/file.c
View File

@ -22,8 +22,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/coda.h> #include <linux/coda.h>
#include <linux/coda_psdev.h> #include "coda_psdev.h"
#include "coda_linux.h" #include "coda_linux.h"
#include "coda_int.h" #include "coda_int.h"

2
fs/coda/inode.c
View File

@ -27,7 +27,7 @@
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/coda.h> #include <linux/coda.h>
#include <linux/coda_psdev.h> #include "coda_psdev.h"
#include "coda_linux.h" #include "coda_linux.h"
#include "coda_cache.h" #include "coda_cache.h"

3
fs/coda/pioctl.c
View File

@ -20,8 +20,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/coda.h> #include <linux/coda.h>
#include <linux/coda_psdev.h> #include "coda_psdev.h"
#include "coda_linux.h" #include "coda_linux.h"
/* pioctl ops */ /* pioctl ops */

3
fs/coda/psdev.c
View File

@ -38,8 +38,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/coda.h> #include <linux/coda.h>
#include <linux/coda_psdev.h> #include "coda_psdev.h"
#include "coda_linux.h" #include "coda_linux.h"
#include "coda_int.h" #include "coda_int.h"

3
fs/coda/symlink.c
View File

@ -17,8 +17,7 @@
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/coda.h> #include <linux/coda.h>
#include <linux/coda_psdev.h> #include "coda_psdev.h"
#include "coda_linux.h" #include "coda_linux.h"
static int coda_symlink_filler(struct file *file, struct page *page) static int coda_symlink_filler(struct file *file, struct page *page)

2
fs/coda/upcall.c
View File

@ -33,7 +33,7 @@
#include <linux/vfs.h> #include <linux/vfs.h>
#include <linux/coda.h> #include <linux/coda.h>
#include <linux/coda_psdev.h> #include "coda_psdev.h"
#include "coda_linux.h" #include "coda_linux.h"
#include "coda_cache.h" #include "coda_cache.h"