diff options
| author | Peng Tao <bergwolf@gmail.com> | 2013-11-21 22:28:22 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-25 12:35:02 -0800 |
| commit | b831516cc5c4f3f06680cbe4411a57e192bdb676 (patch) | |
| tree | b73a30592e2f93c9387671272305496891d8c1b1 | |
| parent | a34c72b348703da43d605441b86a61688ec19a0d (diff) | |
staging/lustre/libcfs: remove filp_size/filp_poff
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h | 5 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/libcfs/tracefile.c | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h index eebf138f21e5..8fabe4b2f306 100644 --- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h +++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h @@ -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)) diff --git a/drivers/staging/lustre/lustre/libcfs/tracefile.c b/drivers/staging/lustre/lustre/libcfs/tracefile.c index f71a3cc63ad8..0ce4aaca27b4 100644 --- a/drivers/staging/lustre/lustre/libcfs/tracefile.c +++ b/drivers/staging/lustre/lustre/libcfs/tracefile.c @@ -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); |