diff options
Diffstat (limited to 'fs/nfsd/nfs4recover.c')
-rw-r--r-- | fs/nfsd/nfs4recover.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index 1cbd2e4ee122..e9d07704680e 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c | |||
@@ -83,13 +83,13 @@ md5_to_hex(char *out, char *md5) | |||
83 | *out = '\0'; | 83 | *out = '\0'; |
84 | } | 84 | } |
85 | 85 | ||
86 | int | 86 | __be32 |
87 | nfs4_make_rec_clidname(char *dname, struct xdr_netobj *clname) | 87 | nfs4_make_rec_clidname(char *dname, struct xdr_netobj *clname) |
88 | { | 88 | { |
89 | struct xdr_netobj cksum; | 89 | struct xdr_netobj cksum; |
90 | struct hash_desc desc; | 90 | struct hash_desc desc; |
91 | struct scatterlist sg[1]; | 91 | struct scatterlist sg[1]; |
92 | int status = nfserr_resource; | 92 | __be32 status = nfserr_resource; |
93 | 93 | ||
94 | dprintk("NFSD: nfs4_make_rec_clidname for %.*s\n", | 94 | dprintk("NFSD: nfs4_make_rec_clidname for %.*s\n", |
95 | clname->len, clname->data); | 95 | clname->len, clname->data); |
@@ -193,7 +193,7 @@ nfsd4_build_dentrylist(void *arg, const char *name, int namlen, | |||
193 | struct dentry_list *child; | 193 | struct dentry_list *child; |
194 | 194 | ||
195 | if (name && isdotent(name, namlen)) | 195 | if (name && isdotent(name, namlen)) |
196 | return nfs_ok; | 196 | return 0; |
197 | dentry = lookup_one_len(name, parent, namlen); | 197 | dentry = lookup_one_len(name, parent, namlen); |
198 | if (IS_ERR(dentry)) | 198 | if (IS_ERR(dentry)) |
199 | return PTR_ERR(dentry); | 199 | return PTR_ERR(dentry); |
@@ -333,14 +333,14 @@ purge_old(struct dentry *parent, struct dentry *child) | |||
333 | int status; | 333 | int status; |
334 | 334 | ||
335 | if (nfs4_has_reclaimed_state(child->d_name.name)) | 335 | if (nfs4_has_reclaimed_state(child->d_name.name)) |
336 | return nfs_ok; | 336 | return 0; |
337 | 337 | ||
338 | status = nfsd4_clear_clid_dir(parent, child); | 338 | status = nfsd4_clear_clid_dir(parent, child); |
339 | if (status) | 339 | if (status) |
340 | printk("failed to remove client recovery directory %s\n", | 340 | printk("failed to remove client recovery directory %s\n", |
341 | child->d_name.name); | 341 | child->d_name.name); |
342 | /* Keep trying, success or failure: */ | 342 | /* Keep trying, success or failure: */ |
343 | return nfs_ok; | 343 | return 0; |
344 | } | 344 | } |
345 | 345 | ||
346 | void | 346 | void |
@@ -365,10 +365,10 @@ load_recdir(struct dentry *parent, struct dentry *child) | |||
365 | printk("nfsd4: illegal name %s in recovery directory\n", | 365 | printk("nfsd4: illegal name %s in recovery directory\n", |
366 | child->d_name.name); | 366 | child->d_name.name); |
367 | /* Keep trying; maybe the others are OK: */ | 367 | /* Keep trying; maybe the others are OK: */ |
368 | return nfs_ok; | 368 | return 0; |
369 | } | 369 | } |
370 | nfs4_client_to_reclaim(child->d_name.name); | 370 | nfs4_client_to_reclaim(child->d_name.name); |
371 | return nfs_ok; | 371 | return 0; |
372 | } | 372 | } |
373 | 373 | ||
374 | int | 374 | int |