diff options
Diffstat (limited to 'fs/ocfs2/dir.c')
-rw-r--r-- | fs/ocfs2/dir.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c index 7453b70c1a19..6a2f143e269c 100644 --- a/fs/ocfs2/dir.c +++ b/fs/ocfs2/dir.c | |||
@@ -586,7 +586,7 @@ bail: | |||
586 | } | 586 | } |
587 | 587 | ||
588 | static int ocfs2_dir_foreach_blk_id(struct inode *inode, | 588 | static int ocfs2_dir_foreach_blk_id(struct inode *inode, |
589 | unsigned long *f_version, | 589 | u64 *f_version, |
590 | loff_t *f_pos, void *priv, | 590 | loff_t *f_pos, void *priv, |
591 | filldir_t filldir, int *filldir_err) | 591 | filldir_t filldir, int *filldir_err) |
592 | { | 592 | { |
@@ -648,7 +648,7 @@ revalidate: | |||
648 | * not the directory has been modified | 648 | * not the directory has been modified |
649 | * during the copy operation. | 649 | * during the copy operation. |
650 | */ | 650 | */ |
651 | unsigned long version = *f_version; | 651 | u64 version = *f_version; |
652 | unsigned char d_type = DT_UNKNOWN; | 652 | unsigned char d_type = DT_UNKNOWN; |
653 | 653 | ||
654 | if (de->file_type < OCFS2_FT_MAX) | 654 | if (de->file_type < OCFS2_FT_MAX) |
@@ -677,7 +677,7 @@ out: | |||
677 | } | 677 | } |
678 | 678 | ||
679 | static int ocfs2_dir_foreach_blk_el(struct inode *inode, | 679 | static int ocfs2_dir_foreach_blk_el(struct inode *inode, |
680 | unsigned long *f_version, | 680 | u64 *f_version, |
681 | loff_t *f_pos, void *priv, | 681 | loff_t *f_pos, void *priv, |
682 | filldir_t filldir, int *filldir_err) | 682 | filldir_t filldir, int *filldir_err) |
683 | { | 683 | { |
@@ -798,7 +798,7 @@ out: | |||
798 | return stored; | 798 | return stored; |
799 | } | 799 | } |
800 | 800 | ||
801 | static int ocfs2_dir_foreach_blk(struct inode *inode, unsigned long *f_version, | 801 | static int ocfs2_dir_foreach_blk(struct inode *inode, u64 *f_version, |
802 | loff_t *f_pos, void *priv, filldir_t filldir, | 802 | loff_t *f_pos, void *priv, filldir_t filldir, |
803 | int *filldir_err) | 803 | int *filldir_err) |
804 | { | 804 | { |
@@ -818,7 +818,7 @@ int ocfs2_dir_foreach(struct inode *inode, loff_t *f_pos, void *priv, | |||
818 | filldir_t filldir) | 818 | filldir_t filldir) |
819 | { | 819 | { |
820 | int ret = 0, filldir_err = 0; | 820 | int ret = 0, filldir_err = 0; |
821 | unsigned long version = inode->i_version; | 821 | u64 version = inode->i_version; |
822 | 822 | ||
823 | while (*f_pos < i_size_read(inode)) { | 823 | while (*f_pos < i_size_read(inode)) { |
824 | ret = ocfs2_dir_foreach_blk(inode, &version, f_pos, priv, | 824 | ret = ocfs2_dir_foreach_blk(inode, &version, f_pos, priv, |