Commit c2642ab0 authored Jan 18, 2006 by J. Bruce Fields Committed by Linus Torvalds Jan 18, 2006

[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>

parent d22749b6

fs/nfsd/nfs4recover.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -399,9 +399,10 @@ nfsd4_init_recdir(char *rec_dirname)

		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);

		if (!status)

Admin message