diff options
| author | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2017-04-07 20:14:55 +0200 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2017-04-20 19:39:32 +0200 |
| commit | 1a916ce0497847ce4a1b21c63383a3653c613055 (patch) | |
| tree | c422ff561bc2fe2d97c6f17510d1d0bc920c794a | |
| parent | nfs: flexfilelayout: remove v3-only data server limitation (diff) | |
| download | linux-1a916ce0497847ce4a1b21c63383a3653c613055.tar.xz linux-1a916ce0497847ce4a1b21c63383a3653c613055.zip | |
NFS: Clean up do_callback_layoutrecall()
Removing the dprintk()s lets us simplify the function by removing the
else condition entirely and returning the status of
initiate_{file,bulk}_draining() directly.
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
| -rw-r--r-- | fs/nfs/callback_proc.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c index f073a6d2c6a5..c52408055721 100644 --- a/fs/nfs/callback_proc.c +++ b/fs/nfs/callback_proc.c @@ -317,16 +317,9 @@ static u32 initiate_bulk_draining(struct nfs_client *clp, static u32 do_callback_layoutrecall(struct nfs_client *clp, struct cb_layoutrecallargs *args) { - u32 res; - - dprintk("%s enter, type=%i\n", __func__, args->cbl_recall_type); if (args->cbl_recall_type == RETURN_FILE) - res = initiate_file_draining(clp, args); - else - res = initiate_bulk_draining(clp, args); - dprintk("%s returning %i\n", __func__, res); - return res; - + return initiate_file_draining(clp, args); + return initiate_bulk_draining(clp, args); } __be32 nfs4_callback_layoutrecall(struct cb_layoutrecallargs *args, |