mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 23:32:14 +00:00
NFS,SUNRPC,NLM: fix unused variable warnings when CONFIG_SYSCTL is disabled
Fix some dprintk's so that NLM, NFS client, and RPC client compile cleanly if CONFIG_SYSCTL is disabled. Test plan: Compile kernel with CONFIG_NFS enabled and CONFIG_SYSCTL disabled. Signed-off-by: Chuck Lever <cel@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
c556b75496
commit
0bbacc402e
4 changed files with 51 additions and 29 deletions
|
@ -655,7 +655,6 @@ nfs_file_direct_read(struct kiocb *iocb, char __user *buf, size_t count, loff_t
|
|||
struct file *file = iocb->ki_filp;
|
||||
struct nfs_open_context *ctx =
|
||||
(struct nfs_open_context *) file->private_data;
|
||||
struct dentry *dentry = file->f_dentry;
|
||||
struct address_space *mapping = file->f_mapping;
|
||||
struct inode *inode = mapping->host;
|
||||
struct iovec iov = {
|
||||
|
@ -664,7 +663,8 @@ nfs_file_direct_read(struct kiocb *iocb, char __user *buf, size_t count, loff_t
|
|||
};
|
||||
|
||||
dprintk("nfs: direct read(%s/%s, %lu@%lu)\n",
|
||||
dentry->d_parent->d_name.name, dentry->d_name.name,
|
||||
file->f_dentry->d_parent->d_name.name,
|
||||
file->f_dentry->d_name.name,
|
||||
(unsigned long) count, (unsigned long) pos);
|
||||
|
||||
if (!is_sync_kiocb(iocb))
|
||||
|
@ -730,7 +730,6 @@ nfs_file_direct_write(struct kiocb *iocb, const char __user *buf, size_t count,
|
|||
struct file *file = iocb->ki_filp;
|
||||
struct nfs_open_context *ctx =
|
||||
(struct nfs_open_context *) file->private_data;
|
||||
struct dentry *dentry = file->f_dentry;
|
||||
struct address_space *mapping = file->f_mapping;
|
||||
struct inode *inode = mapping->host;
|
||||
struct iovec iov = {
|
||||
|
@ -739,8 +738,9 @@ nfs_file_direct_write(struct kiocb *iocb, const char __user *buf, size_t count,
|
|||
};
|
||||
|
||||
dfprintk(VFS, "nfs: direct write(%s/%s(%ld), %lu@%lu)\n",
|
||||
dentry->d_parent->d_name.name, dentry->d_name.name,
|
||||
inode->i_ino, (unsigned long) count, (unsigned long) pos);
|
||||
file->f_dentry->d_parent->d_name.name,
|
||||
file->f_dentry->d_name.name, inode->i_ino,
|
||||
(unsigned long) count, (unsigned long) pos);
|
||||
|
||||
if (!is_sync_kiocb(iocb))
|
||||
goto out;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue