GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 07:12:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

nfsd4_list_rec_dir(): don't bother with reopening rec_file

Browse source 
just rewind it to the beginning before vfs_readdir() and be
done with that...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2011-07-07 18:43:21 -04:00
parent e7f5909707
commit 5b4b299cc7
1 changed files with 21 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

52
fs/nfsd/nfs4recover.c
View file

@ -191,52 +191,42 @@ nfsd4_build_namelist(void *arg, const char *name, int namlen,
} }
static int static int
nfsd4_list_rec_dir(struct dentry *dir, recdir_func *f) nfsd4_list_rec_dir(recdir_func *f)
{ {
const struct cred *original_cred; const struct cred *original_cred;
struct file *filp; struct dentry *dir = rec_file->f_path.dentry;
LIST_HEAD(names); LIST_HEAD(names);
struct name_list *entry;
struct dentry *dentry;
int status; int status;
if (!rec_file)
return 0;
status = nfs4_save_creds(&original_cred); status = nfs4_save_creds(&original_cred);
if (status < 0) if (status < 0)
return status; return status;
filp = dentry_open(dget(dir), mntget(rec_file->f_path.mnt), O_RDONLY, status = vfs_llseek(rec_file, 0, SEEK_SET);
current_cred()); if (status < 0) {
status = PTR_ERR(filp); nfs4_reset_creds(original_cred);
if (IS_ERR(filp)) return status;
goto out; }
status = vfs_readdir(filp, nfsd4_build_namelist, &names);
fput(filp); status = vfs_readdir(rec_file, nfsd4_build_namelist, &names);
mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT); mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
while (!list_empty(&names)) { while (!list_empty(&names)) {
struct name_list *entry;
entry = list_entry(names.next, struct name_list, list); entry = list_entry(names.next, struct name_list, list);
if (!status) {
dentry = lookup_one_len(entry->name, dir, HEXDIR_LEN-1); struct dentry *dentry;
if (IS_ERR(dentry)) { dentry = lookup_one_len(entry->name, dir, HEXDIR_LEN-1);
status = PTR_ERR(dentry); if (IS_ERR(dentry)) {
break; status = PTR_ERR(dentry);
break;
}
status = f(dir, dentry);
dput(dentry);
} }
status = f(dir, dentry);
dput(dentry);
if (status)
break;
list_del(&entry->list); list_del(&entry->list);
kfree(entry); kfree(entry);
} }
mutex_unlock(&dir->d_inode->i_mutex); mutex_unlock(&dir->d_inode->i_mutex);
out:
while (!list_empty(&names)) {
entry = list_entry(names.next, struct name_list, list);
list_del(&entry->list);
kfree(entry);
}
nfs4_reset_creds(original_cred); nfs4_reset_creds(original_cred);
return status; return status;
} }
@ -322,7 +312,7 @@ nfsd4_recdir_purge_old(void) {
status = mnt_want_write(rec_file->f_path.mnt); status = mnt_want_write(rec_file->f_path.mnt);
if (status) if (status)
goto out; goto out;
status = nfsd4_list_rec_dir(rec_file->f_path.dentry, purge_old); status = nfsd4_list_rec_dir(purge_old);
if (status == 0) if (status == 0)
vfs_fsync(rec_file, 0); vfs_fsync(rec_file, 0);
mnt_drop_write(rec_file->f_path.mnt); mnt_drop_write(rec_file->f_path.mnt);
@ -352,7 +342,7 @@ nfsd4_recdir_load(void) {
if (!rec_file) if (!rec_file)
return 0; return 0;
status = nfsd4_list_rec_dir(rec_file->f_path.dentry, load_recdir); status = nfsd4_list_rec_dir(load_recdir);
if (status) if (status)
printk("nfsd4: failed loading clients from recovery" printk("nfsd4: failed loading clients from recovery"
" directory %s\n", rec_file->f_path.dentry->d_name.name); " directory %s\n", rec_file->f_path.dentry->d_name.name);