Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b831516c authored by Peng Tao's avatar Peng Tao Committed by Greg Kroah-Hartman
Browse files

staging/lustre/libcfs: remove filp_size/filp_poff 



Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarPeng Tao <bergwolf@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a34c72b3

drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h

+0 −5
Original line number Diff line number Diff line
@@ -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))

drivers/staging/lustre/lustre/libcfs/tracefile.c

+3 −3
Original line number Diff line number Diff line
@@ -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);