diff options
author | Christoph Hellwig <hch@lst.de> | 2010-03-22 12:32:25 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-05-21 18:31:21 -0400 |
commit | 8018ab057480974e7f26a387bf4ce040e9a5f6f1 (patch) | |
tree | 98298180bf60797a028eca4f24234dc67d38a9d4 /fs/nfsd/nfs4recover.c | |
parent | e970a573ce30a3976234dcfb67906c164b0df9ee (diff) |
sanitize vfs_fsync calling conventions
Now that the last user passing a NULL file pointer is gone we can remove
the redundant dentry argument and associated hacks inside vfs_fsynmc_range.
The next step will be removig the dentry argument from ->fsync, but given
the luck with the last round of method prototype changes I'd rather
defer this until after the main merge window.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfsd/nfs4recover.c')
-rw-r--r-- | fs/nfsd/nfs4recover.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index dada03f2c13b..7e26caab2a26 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c | |||
@@ -158,7 +158,7 @@ out_unlock: | |||
158 | mutex_unlock(&dir->d_inode->i_mutex); | 158 | mutex_unlock(&dir->d_inode->i_mutex); |
159 | if (status == 0) { | 159 | if (status == 0) { |
160 | clp->cl_firststate = 1; | 160 | clp->cl_firststate = 1; |
161 | vfs_fsync(rec_file, rec_file->f_path.dentry, 0); | 161 | vfs_fsync(rec_file, 0); |
162 | } | 162 | } |
163 | nfs4_reset_creds(original_cred); | 163 | nfs4_reset_creds(original_cred); |
164 | dprintk("NFSD: nfsd4_create_clid_dir returns %d\n", status); | 164 | dprintk("NFSD: nfsd4_create_clid_dir returns %d\n", status); |
@@ -288,7 +288,7 @@ nfsd4_remove_clid_dir(struct nfs4_client *clp) | |||
288 | status = nfsd4_unlink_clid_dir(clp->cl_recdir, HEXDIR_LEN-1); | 288 | status = nfsd4_unlink_clid_dir(clp->cl_recdir, HEXDIR_LEN-1); |
289 | nfs4_reset_creds(original_cred); | 289 | nfs4_reset_creds(original_cred); |
290 | if (status == 0) | 290 | if (status == 0) |
291 | vfs_fsync(rec_file, rec_file->f_path.dentry, 0); | 291 | vfs_fsync(rec_file, 0); |
292 | mnt_drop_write(rec_file->f_path.mnt); | 292 | mnt_drop_write(rec_file->f_path.mnt); |
293 | out: | 293 | out: |
294 | if (status) | 294 | if (status) |
@@ -325,7 +325,7 @@ nfsd4_recdir_purge_old(void) { | |||
325 | goto out; | 325 | goto out; |
326 | status = nfsd4_list_rec_dir(rec_file->f_path.dentry, purge_old); | 326 | status = nfsd4_list_rec_dir(rec_file->f_path.dentry, purge_old); |
327 | if (status == 0) | 327 | if (status == 0) |
328 | vfs_fsync(rec_file, rec_file->f_path.dentry, 0); | 328 | vfs_fsync(rec_file, 0); |
329 | mnt_drop_write(rec_file->f_path.mnt); | 329 | mnt_drop_write(rec_file->f_path.mnt); |
330 | out: | 330 | out: |
331 | if (status) | 331 | if (status) |