sanitize vfs_fsync calling conventions
Subsystems (9)
PATCH 2/2 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 <[email protected]>
drivers/block/loop.c +2 -2
@@ -484,7 +484,7 @@ static int do_bio_filebacked(struct loop goto out; } - ret =vfs_fsync (file, file->f_path.dentry,0 ); + ret =vfs_fsync (file,0 );if (unlikely (ret)) { ret = -EIO ; goto out;
@@ -494,7 +494,7 @@ static int do_bio_filebacked(struct loop ret =lo_send (lo, bio, pos);if (barrier && !ret) { - ret =vfs_fsync (file, file->f_path.dentry,0 ); + ret =vfs_fsync (file,0 );if (unlikely (ret)) ret = -EIO ; }
drivers/md/bitmap.c +1 -1
@@ -1692,7 +1692,7 @@ int bitmap_create(mddev_t *mddev)* and bypass the page cache, we must sync the file * first. */ -vfs_fsync (file, file->f_dentry,1 ); +vfs_fsync (file,1 ); }/* read superblock from bitmap file (this sets mddev->bitmap_info.chunksize) */ if (!mddev->bitmap_info.external)
drivers/usb/gadget/storage_common.c +1 -1
@@ -654,7 +654,7 @@ static int fsg_lun_fsync_sub(struct fsg_if (curlun->ro || !filp)return 0 ; -return vfs_fsync (filp, filp->f_path.dentry,1 ); +return vfs_fsync (filp,1 ); }static void store_cdrom_address (u8 *dest,int msf,u32 addr)
fs/coda/file.c +1 -1
@@ -216,7 +216,7 @@ int coda_fsync(struct file *coda_file, sBUG_ON (!cfi || cfi->cfi_magic !=CODA_MAGIC ); host_file = cfi->cfi_container; - err =vfs_fsync (host_file, host_file->f_path.dentry, datasync); + err =vfs_fsync (host_file, datasync);if ( !err && !datasync ) {lock_kernel (); err =venus_fsync (coda_inode->i_sb,coda_i2f (coda_inode));
fs/ecryptfs/file.c +1 -3
@@ -275,9 +275,7 @@ static int ecryptfs_release(struct inodestatic int ecryptfs_fsync (struct file *file,struct dentry *dentry,int datasync) { -return vfs_fsync (ecryptfs_file_to_lower (file), -ecryptfs_dentry_to_lower (dentry), - datasync); +return vfs_fsync (ecryptfs_file_to_lower (file), datasync); }static int ecryptfs_fasync (int fd,struct file *file,int flag)
fs/nfsd/nfs4recover.c +3 -3
@@ -156,7 +156,7 @@ out_unlock:mutex_unlock (&rec_file->f_path.dentry->d_inode->i_mutex);if (status ==0 ) { clp->cl_firststate =1 ; -vfs_fsync (rec_file, rec_file->f_path.dentry,0 ); +vfs_fsync (rec_file,0 ); }nfs4_reset_creds (original_cred);dprintk ("NFSD: nfsd4_create_clid_dir returns %d\n" , status);
@@ -285,7 +285,7 @@ nfsd4_remove_clid_dir(struct nfs4_client status =nfsd4_unlink_clid_dir (clp->cl_recdir,HEXDIR_LEN -1 );nfs4_reset_creds (original_cred);if (status ==0 ) -vfs_fsync (rec_file, rec_file->f_path.dentry,0 ); +vfs_fsync (rec_file,0 );mnt_drop_write (rec_file->f_path.mnt); out:if (status)
@@ -322,7 +322,7 @@ nfsd4_recdir_purge_old(void) { goto out; status =nfsd4_list_rec_dir (rec_file->f_path.dentry, purge_old);if (status ==0 ) -vfs_fsync (rec_file, rec_file->f_path.dentry,0 ); +vfs_fsync (rec_file,0 );mnt_drop_write (rec_file->f_path.mnt); out:if (status)
fs/nfsd/vfs.c +2 -3
@@ -997,7 +997,7 @@ static int wait_for_concurrent_writes(stif (inode->i_state &I_DIRTY ) {dprintk ("nfsd: write sync %d\n" ,task_pid_nr (current)); - err =vfs_fsync (file, file->f_path.dentry,0 ); + err =vfs_fsync (file,0 ); } last_ino = inode->i_ino; last_dev = inode->i_sb->s_dev;
@@ -1172,8 +1172,7 @@ nfsd_commit(struct svc_rqst *rqstp, struif (err) goto out;if (EX_ISSYNC (fhp->fh_export)) { -int err2 =vfs_fsync_range (file, file->f_path.dentry, - offset, end,0 ); +int err2 =vfs_fsync_range (file, offset, end,0 );if (err2 != -EINVAL ) err =nfserrno (err2);
include/linux/fs.h +3 -3
@@ -2087,9 +2087,9 @@ extern int __filemap_fdatawrite_range(stextern int filemap_fdatawrite_range (struct address_space *mapping,loff_t start,loff_t end); -extern int vfs_fsync_range (struct file *file,struct dentry *dentry, -loff_t start,loff_t end,int datasync); -extern int vfs_fsync (struct file *file,struct dentry *dentry,int datasync); +extern int vfs_fsync_range (struct file *file,loff_t start,loff_t end, +int datasync); +extern int vfs_fsync (struct file *file,int datasync);extern int generic_write_sync (struct file *file,loff_t pos,loff_t count);extern void sync_supers (void );extern void emergency_sync (void );
mm/msync.c +1 -1
@@ -82,7 +82,7 @@ SYSCALL_DEFINE3(msync, unsigned long, st (vma->vm_flags & VM_SHARED)) {get_file (file);up_read (&mm->mmap_sem); - error =vfs_fsync (file, file->f_path.dentry,0 ); + error =vfs_fsync (file,0 );fput (file);if (error || start >= end) goto out;
fs/sync.c +8 -34
88 lines not on this page · raw message
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html