diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2013-09-16 10:57:01 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2013-10-02 16:18:24 -0400 |
| commit | 97e47fa11deae10ae72aa1109e700565c57152f5 (patch) | |
| tree | f88d92daf5c9ceaa3a8f4866e319411fa9fe8cc4 /fs/nfsd/nfs4state.c | |
| parent | 15c03dd4859ab16f9212238f29dd315654aa94f6 (diff) | |
nfsd: switch to %p[dD]
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 0874998a49cd..a601fd49f997 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
| @@ -3843,9 +3843,8 @@ nfsd4_open_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, | |||
| 3843 | struct nfs4_ol_stateid *stp; | 3843 | struct nfs4_ol_stateid *stp; |
| 3844 | struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id); | 3844 | struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id); |
| 3845 | 3845 | ||
| 3846 | dprintk("NFSD: nfsd4_open_confirm on file %.*s\n", | 3846 | dprintk("NFSD: nfsd4_open_confirm on file %pd\n", |
| 3847 | (int)cstate->current_fh.fh_dentry->d_name.len, | 3847 | cstate->current_fh.fh_dentry); |
| 3848 | cstate->current_fh.fh_dentry->d_name.name); | ||
| 3849 | 3848 | ||
| 3850 | status = fh_verify(rqstp, &cstate->current_fh, S_IFREG, 0); | 3849 | status = fh_verify(rqstp, &cstate->current_fh, S_IFREG, 0); |
| 3851 | if (status) | 3850 | if (status) |
| @@ -3922,9 +3921,8 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp, | |||
| 3922 | struct nfs4_ol_stateid *stp; | 3921 | struct nfs4_ol_stateid *stp; |
| 3923 | struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id); | 3922 | struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id); |
| 3924 | 3923 | ||
| 3925 | dprintk("NFSD: nfsd4_open_downgrade on file %.*s\n", | 3924 | dprintk("NFSD: nfsd4_open_downgrade on file %pd\n", |
| 3926 | (int)cstate->current_fh.fh_dentry->d_name.len, | 3925 | cstate->current_fh.fh_dentry); |
| 3927 | cstate->current_fh.fh_dentry->d_name.name); | ||
| 3928 | 3926 | ||
| 3929 | /* We don't yet support WANT bits: */ | 3927 | /* We don't yet support WANT bits: */ |
| 3930 | if (od->od_deleg_want) | 3928 | if (od->od_deleg_want) |
| @@ -3980,9 +3978,8 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, | |||
| 3980 | struct net *net = SVC_NET(rqstp); | 3978 | struct net *net = SVC_NET(rqstp); |
| 3981 | struct nfsd_net *nn = net_generic(net, nfsd_net_id); | 3979 | struct nfsd_net *nn = net_generic(net, nfsd_net_id); |
| 3982 | 3980 | ||
| 3983 | dprintk("NFSD: nfsd4_close on file %.*s\n", | 3981 | dprintk("NFSD: nfsd4_close on file %pd\n", |
| 3984 | (int)cstate->current_fh.fh_dentry->d_name.len, | 3982 | cstate->current_fh.fh_dentry); |
| 3985 | cstate->current_fh.fh_dentry->d_name.name); | ||
| 3986 | 3983 | ||
| 3987 | nfs4_lock_state(); | 3984 | nfs4_lock_state(); |
| 3988 | status = nfs4_preprocess_seqid_op(cstate, close->cl_seqid, | 3985 | status = nfs4_preprocess_seqid_op(cstate, close->cl_seqid, |