NFS,SUNRPC: Fix compiler warnings if CONFIG_PROC_FS & CONFIG_SYSCTL are unset
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
7866babad5
commit
e99170ff3b
|
@ -112,10 +112,9 @@ static void nfs_direct_write_complete(struct nfs_direct_req *dreq, struct inode
|
|||
*/
|
||||
ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t pos, unsigned long nr_segs)
|
||||
{
|
||||
struct dentry *dentry = iocb->ki_filp->f_dentry;
|
||||
|
||||
dprintk("NFS: nfs_direct_IO (%s) off/no(%Ld/%lu) EINVAL\n",
|
||||
dentry->d_name.name, (long long) pos, nr_segs);
|
||||
iocb->ki_filp->f_dentry->d_name.name,
|
||||
(long long) pos, nr_segs);
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
|
@ -468,7 +467,6 @@ static const struct rpc_call_ops nfs_commit_direct_ops = {
|
|||
static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq)
|
||||
{
|
||||
struct nfs_write_data *data = dreq->commit_data;
|
||||
struct rpc_task *task = &data->task;
|
||||
|
||||
data->inode = dreq->inode;
|
||||
data->cred = dreq->ctx->cred;
|
||||
|
@ -489,7 +487,7 @@ static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq)
|
|||
/* Note: task.tk_ops->rpc_release will free dreq->commit_data */
|
||||
dreq->commit_data = NULL;
|
||||
|
||||
dprintk("NFS: %5u initiated commit call\n", task->tk_pid);
|
||||
dprintk("NFS: %5u initiated commit call\n", data->task.tk_pid);
|
||||
|
||||
lock_kernel();
|
||||
rpc_execute(&data->task);
|
||||
|
|
|
@ -534,10 +534,9 @@ static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl)
|
|||
*/
|
||||
static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl)
|
||||
{
|
||||
struct inode * inode = filp->f_mapping->host;
|
||||
|
||||
dprintk("NFS: nfs_flock(f=%s/%ld, t=%x, fl=%x)\n",
|
||||
inode->i_sb->s_id, inode->i_ino,
|
||||
filp->f_dentry->d_inode->i_sb->s_id,
|
||||
filp->f_dentry->d_inode->i_ino,
|
||||
fl->fl_type, fl->fl_flags);
|
||||
|
||||
/*
|
||||
|
|
|
@ -53,6 +53,7 @@ struct rpc_timeout {
|
|||
|
||||
struct rpc_task;
|
||||
struct rpc_xprt;
|
||||
struct seq_file;
|
||||
|
||||
/*
|
||||
* This describes a complete RPC request
|
||||
|
|
Loading…
Reference in New Issue