Commit e99170ff authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS,SUNRPC: Fix compiler warnings if CONFIG_PROC_FS & CONFIG_SYSCTL are unset


Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 7866baba
...@@ -112,10 +112,9 @@ static void nfs_direct_write_complete(struct nfs_direct_req *dreq, struct inode ...@@ -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) 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", 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; return -EINVAL;
} }
...@@ -468,7 +467,6 @@ static const struct rpc_call_ops nfs_commit_direct_ops = { ...@@ -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) static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq)
{ {
struct nfs_write_data *data = dreq->commit_data; struct nfs_write_data *data = dreq->commit_data;
struct rpc_task *task = &data->task;
data->inode = dreq->inode; data->inode = dreq->inode;
data->cred = dreq->ctx->cred; data->cred = dreq->ctx->cred;
...@@ -489,7 +487,7 @@ static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq) ...@@ -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 */ /* Note: task.tk_ops->rpc_release will free dreq->commit_data */
dreq->commit_data = NULL; 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(); lock_kernel();
rpc_execute(&data->task); rpc_execute(&data->task);
......
...@@ -534,10 +534,9 @@ static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl) ...@@ -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) 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", 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); fl->fl_type, fl->fl_flags);
/* /*
......
...@@ -53,6 +53,7 @@ struct rpc_timeout { ...@@ -53,6 +53,7 @@ struct rpc_timeout {
struct rpc_task; struct rpc_task;
struct rpc_xprt; struct rpc_xprt;
struct seq_file;
/* /*
* This describes a complete RPC request * This describes a complete RPC request
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment