diff options
author | Chuck Lever <cel@netapp.com> | 2005-11-01 16:53:32 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-11-04 15:39:48 -0500 |
commit | 0bbacc402e67abca8794a8401c1621dc0c0202e9 (patch) | |
tree | a0969978295b806b35c943eb16af34b1eacfa47a /fs/nfs/write.c | |
parent | c556b754967afd0878d65de2cfe0675577b0f62f (diff) |
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>
Diffstat (limited to 'fs/nfs/write.c')
-rw-r--r-- | fs/nfs/write.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 1bdbd4f9fdd2..8f71e766cc5d 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
@@ -734,14 +734,14 @@ int nfs_updatepage(struct file *file, struct page *page, | |||
734 | unsigned int offset, unsigned int count) | 734 | unsigned int offset, unsigned int count) |
735 | { | 735 | { |
736 | struct nfs_open_context *ctx = (struct nfs_open_context *)file->private_data; | 736 | struct nfs_open_context *ctx = (struct nfs_open_context *)file->private_data; |
737 | struct dentry *dentry = file->f_dentry; | ||
738 | struct inode *inode = page->mapping->host; | 737 | struct inode *inode = page->mapping->host; |
739 | struct nfs_page *req; | 738 | struct nfs_page *req; |
740 | int status = 0; | 739 | int status = 0; |
741 | 740 | ||
742 | dprintk("NFS: nfs_updatepage(%s/%s %d@%Ld)\n", | 741 | dprintk("NFS: nfs_updatepage(%s/%s %d@%Ld)\n", |
743 | dentry->d_parent->d_name.name, dentry->d_name.name, | 742 | file->f_dentry->d_parent->d_name.name, |
744 | count, (long long)(page_offset(page) +offset)); | 743 | file->f_dentry->d_name.name, count, |
744 | (long long)(page_offset(page) +offset)); | ||
745 | 745 | ||
746 | if (IS_SYNC(inode)) { | 746 | if (IS_SYNC(inode)) { |
747 | status = nfs_writepage_sync(ctx, inode, page, offset, count, 0); | 747 | status = nfs_writepage_sync(ctx, inode, page, offset, count, 0); |
@@ -850,7 +850,6 @@ static void nfs_write_rpcsetup(struct nfs_page *req, | |||
850 | unsigned int count, unsigned int offset, | 850 | unsigned int count, unsigned int offset, |
851 | int how) | 851 | int how) |
852 | { | 852 | { |
853 | struct rpc_task *task = &data->task; | ||
854 | struct inode *inode; | 853 | struct inode *inode; |
855 | 854 | ||
856 | /* Set up the RPC argument and reply structs | 855 | /* Set up the RPC argument and reply structs |
@@ -881,7 +880,7 @@ static void nfs_write_rpcsetup(struct nfs_page *req, | |||
881 | data->task.tk_release = nfs_writedata_release; | 880 | data->task.tk_release = nfs_writedata_release; |
882 | 881 | ||
883 | dprintk("NFS: %4d initiated write call (req %s/%Ld, %u bytes @ offset %Lu)\n", | 882 | dprintk("NFS: %4d initiated write call (req %s/%Ld, %u bytes @ offset %Lu)\n", |
884 | task->tk_pid, | 883 | data->task.tk_pid, |
885 | inode->i_sb->s_id, | 884 | inode->i_sb->s_id, |
886 | (long long)NFS_FILEID(inode), | 885 | (long long)NFS_FILEID(inode), |
887 | count, | 886 | count, |
@@ -1217,7 +1216,6 @@ static void nfs_commit_release(struct rpc_task *task) | |||
1217 | static void nfs_commit_rpcsetup(struct list_head *head, | 1216 | static void nfs_commit_rpcsetup(struct list_head *head, |
1218 | struct nfs_write_data *data, int how) | 1217 | struct nfs_write_data *data, int how) |
1219 | { | 1218 | { |
1220 | struct rpc_task *task = &data->task; | ||
1221 | struct nfs_page *first; | 1219 | struct nfs_page *first; |
1222 | struct inode *inode; | 1220 | struct inode *inode; |
1223 | 1221 | ||
@@ -1248,7 +1246,7 @@ static void nfs_commit_rpcsetup(struct list_head *head, | |||
1248 | /* Release requests */ | 1246 | /* Release requests */ |
1249 | data->task.tk_release = nfs_commit_release; | 1247 | data->task.tk_release = nfs_commit_release; |
1250 | 1248 | ||
1251 | dprintk("NFS: %4d initiated commit call\n", task->tk_pid); | 1249 | dprintk("NFS: %4d initiated commit call\n", data->task.tk_pid); |
1252 | } | 1250 | } |
1253 | 1251 | ||
1254 | /* | 1252 | /* |