Browse Source

[PATCH] nfsd4: recovery lookup dir check

Make sure we get a directory when we look up the recovery directory.

Thanks to Christoph Hellwig for the bug report.

Based on feedback from Christoph and others, we may remove the need for this
lookup and just pass in a file descriptor from userspace instead, and/or
completely move the directory handling to userspace.  For now we're just
fixing the obvious bugs.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
J. Bruce Fields 20 năm trước cách đây
mục cha
commit
c2642ab05b
1 tập tin đã thay đổi với 4 bổ sung3 xóa
  1. 4 3
      fs/nfsd/nfs4recover.c

+ 4 - 3
fs/nfsd/nfs4recover.c

@@ -399,9 +399,10 @@ nfsd4_init_recdir(char *rec_dirname)
 
 
 	nfs4_save_user(&uid, &gid);
 	nfs4_save_user(&uid, &gid);
 
 
-	status = path_lookup(rec_dirname, LOOKUP_FOLLOW, &rec_dir);
-	if (status == -ENOENT)
-		printk("NFSD: recovery directory %s doesn't exist\n",
+	status = path_lookup(rec_dirname, LOOKUP_FOLLOW | LOOKUP_DIRECTORY,
+			&rec_dir);
+	if (status)
+		printk("NFSD: unable to find recovery directory %s\n",
 				rec_dirname);
 				rec_dirname);
 
 
 	if (!status)
 	if (!status)