From: Jaegeuk Kim Date: Thu, 2 Jun 2016 20:49:38 +0000 (-0700) Subject: f2fs: remove obsolete parameter in f2fs_truncate X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9a449e9c3b34ef3f7029bd966f98cbbfccd144e5;p=deliverable%2Flinux.git f2fs: remove obsolete parameter in f2fs_truncate We don't need lock parameter, which is always true. Signed-off-by: Jaegeuk Kim --- diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index dc9e2798ba9c..e21f9df133d1 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1854,7 +1854,7 @@ static inline void *f2fs_kvzalloc(size_t size, gfp_t flags) int f2fs_sync_file(struct file *, loff_t, loff_t, int); void truncate_data_blocks(struct dnode_of_data *); int truncate_blocks(struct inode *, u64, bool); -int f2fs_truncate(struct inode *, bool); +int f2fs_truncate(struct inode *); int f2fs_getattr(struct vfsmount *, struct dentry *, struct kstat *); int f2fs_setattr(struct dentry *, struct iattr *); int truncate_hole(struct inode *, pgoff_t, pgoff_t); diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 23decf050236..7a8d262bc488 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -608,7 +608,7 @@ free_partial: return err; } -int f2fs_truncate(struct inode *inode, bool lock) +int f2fs_truncate(struct inode *inode) { int err; @@ -625,7 +625,7 @@ int f2fs_truncate(struct inode *inode, bool lock) return err; } - err = truncate_blocks(inode, i_size_read(inode), lock); + err = truncate_blocks(inode, i_size_read(inode), true); if (err) return err; @@ -689,7 +689,7 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr) if (attr->ia_size <= i_size_read(inode)) { truncate_setsize(inode, attr->ia_size); - err = f2fs_truncate(inode, true); + err = f2fs_truncate(inode); if (err) return err; f2fs_balance_fs(F2FS_I_SB(inode), true); diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c index 11cb60af815d..fb3d9bd597e3 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c @@ -355,7 +355,7 @@ void f2fs_evict_inode(struct inode *inode) i_size_write(inode, 0); retry: if (F2FS_HAS_BLOCKS(inode)) - err = f2fs_truncate(inode, true); + err = f2fs_truncate(inode); if (!err) { f2fs_lock_op(sbi); diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 9e754336e4e5..94bb87dd4b31 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -590,7 +590,7 @@ static int f2fs_drop_inode(struct inode *inode) f2fs_i_size_write(inode, 0); if (F2FS_HAS_BLOCKS(inode)) - f2fs_truncate(inode, true); + f2fs_truncate(inode); sb_end_intwrite(inode->i_sb);