diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfsd/nfs4recover.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index 899ca26dd194..4e9a21db867a 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c | |||
@@ -146,7 +146,7 @@ out_no_tfm: | |||
146 | * then disable recovery tracking. | 146 | * then disable recovery tracking. |
147 | */ | 147 | */ |
148 | static void | 148 | static void |
149 | legacy_recdir_name_error(int error) | 149 | legacy_recdir_name_error(struct nfs4_client *clp, int error) |
150 | { | 150 | { |
151 | printk(KERN_ERR "NFSD: unable to generate recoverydir " | 151 | printk(KERN_ERR "NFSD: unable to generate recoverydir " |
152 | "name (%d).\n", error); | 152 | "name (%d).\n", error); |
@@ -159,9 +159,7 @@ legacy_recdir_name_error(int error) | |||
159 | if (error == -ENOENT) { | 159 | if (error == -ENOENT) { |
160 | printk(KERN_ERR "NFSD: disabling legacy clientid tracking. " | 160 | printk(KERN_ERR "NFSD: disabling legacy clientid tracking. " |
161 | "Reboot recovery will not function correctly!\n"); | 161 | "Reboot recovery will not function correctly!\n"); |
162 | 162 | nfsd4_client_tracking_exit(clp->net); | |
163 | /* the argument is ignored by the legacy exit function */ | ||
164 | nfsd4_client_tracking_exit(NULL); | ||
165 | } | 163 | } |
166 | } | 164 | } |
167 | 165 | ||
@@ -184,7 +182,7 @@ nfsd4_create_clid_dir(struct nfs4_client *clp) | |||
184 | 182 | ||
185 | status = nfs4_make_rec_clidname(dname, &clp->cl_name); | 183 | status = nfs4_make_rec_clidname(dname, &clp->cl_name); |
186 | if (status) | 184 | if (status) |
187 | return legacy_recdir_name_error(status); | 185 | return legacy_recdir_name_error(clp, status); |
188 | 186 | ||
189 | status = nfs4_save_creds(&original_cred); | 187 | status = nfs4_save_creds(&original_cred); |
190 | if (status < 0) | 188 | if (status < 0) |
@@ -341,7 +339,7 @@ nfsd4_remove_clid_dir(struct nfs4_client *clp) | |||
341 | 339 | ||
342 | status = nfs4_make_rec_clidname(dname, &clp->cl_name); | 340 | status = nfs4_make_rec_clidname(dname, &clp->cl_name); |
343 | if (status) | 341 | if (status) |
344 | return legacy_recdir_name_error(status); | 342 | return legacy_recdir_name_error(clp, status); |
345 | 343 | ||
346 | status = mnt_want_write_file(nn->rec_file); | 344 | status = mnt_want_write_file(nn->rec_file); |
347 | if (status) | 345 | if (status) |
@@ -601,7 +599,7 @@ nfsd4_check_legacy_client(struct nfs4_client *clp) | |||
601 | 599 | ||
602 | status = nfs4_make_rec_clidname(dname, &clp->cl_name); | 600 | status = nfs4_make_rec_clidname(dname, &clp->cl_name); |
603 | if (status) { | 601 | if (status) { |
604 | legacy_recdir_name_error(status); | 602 | legacy_recdir_name_error(clp, status); |
605 | return status; | 603 | return status; |
606 | } | 604 | } |
607 | 605 | ||