iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging/lustre/libcfs: remove filp_size/filp_poff

Browse Source 
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peng Tao 2013-11-21 22:28:22 +08:00 committed by Greg Kroah-Hartman
parent a34c72b348
commit b831516cc5
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h
View File

@ -52,11 +52,6 @@
#include <linux/backing-dev.h>
#include <linux/posix_acl_xattr.h>
#define filp_size(f) \
(i_size_read((f)->f_dentry->d_inode))
#define filp_poff(f) \
(&(f)->f_pos)
# define do_fsync(fp, flag) \
((fp)->f_op->fsync(fp, 0, LLONG_MAX, flag))

6
drivers/staging/lustre/lustre/libcfs/tracefile.c
View File

@ -709,7 +709,7 @@ int cfs_tracefile_dump_all_pages(char *filename)
__LASSERT_TAGE_INVARIANT(tage);
rc = filp_write(filp, page_address(tage->page),
tage->used, filp_poff(filp));
tage->used, &filp->f_pos);
if (rc != (int)tage->used) {
printk(KERN_WARNING "wanted to write %u but wrote "
"%d\n", tage->used, rc);
@ -1020,8 +1020,8 @@ static int tracefiled(void *arg)
if (f_pos >= (off_t)cfs_tracefile_size)
f_pos = 0;
else if (f_pos > (off_t)filp_size(filp))
f_pos = filp_size(filp);
else if (f_pos > i_size_read(filp->f_dentry->d_inode))
f_pos = i_size_read(filp->f_dentry->d_inode);
rc = filp_write(filp, page_address(tage->page),
tage->used, &f_pos);