projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into upstream
[powerpc.git]
/
include
/
linux
/
sunrpc
/
rpc_pipe_fs.h
diff --git
a/include/linux/sunrpc/rpc_pipe_fs.h
b/include/linux/sunrpc/rpc_pipe_fs.h
index
a481472
..
4a68125
100644
(file)
--- a/
include/linux/sunrpc/rpc_pipe_fs.h
+++ b/
include/linux/sunrpc/rpc_pipe_fs.h
@@
-30,7
+30,7
@@
struct rpc_inode {
#define RPC_PIPE_WAIT_FOR_OPEN 1
int flags;
struct rpc_pipe_ops *ops;
#define RPC_PIPE_WAIT_FOR_OPEN 1
int flags;
struct rpc_pipe_ops *ops;
- struct
work_struct
queue_timeout;
+ struct
delayed_work
queue_timeout;
};
static inline struct rpc_inode *
};
static inline struct rpc_inode *
@@
-43,7
+43,7
@@
extern int rpc_queue_upcall(struct inode *, struct rpc_pipe_msg *);
extern struct dentry *rpc_mkdir(char *, struct rpc_clnt *);
extern int rpc_rmdir(struct dentry *);
extern struct dentry *rpc_mkdir(char *, struct rpc_clnt *);
extern int rpc_rmdir(struct dentry *);
-extern struct dentry *rpc_mkpipe(char *, void *, struct rpc_pipe_ops *, int flags);
+extern struct dentry *rpc_mkpipe(
struct dentry *, const
char *, void *, struct rpc_pipe_ops *, int flags);
extern int rpc_unlink(struct dentry *);
extern struct vfsmount *rpc_get_mount(void);
extern void rpc_put_mount(void);
extern int rpc_unlink(struct dentry *);
extern struct vfsmount *rpc_get_mount(void);
extern void rpc_put_mount(void);