diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-09-18 16:31:44 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-09-18 16:31:44 +0200 |
| commit | 2cf4ce7c2a07782c3f4d899b380a78522bca3238 (patch) | |
| tree | 46ef48fd4ee47753d6539b65c8a90a2f64e9f8a5 /fs/btrfs/inode.c | |
| parent | Linux 3.1-rc6 (diff) | |
| parent | Btrfs: don't change inode flag of the dest clone file (diff) | |
| download | linux-2cf4ce7c2a07782c3f4d899b380a78522bca3238.tar.xz linux-2cf4ce7c2a07782c3f4d899b380a78522bca3238.zip | |
Merge branch 'btrfs-3.0' into for-linus
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 4d14de6d121b..377e9bb0974f 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4125,7 +4125,8 @@ static int btrfs_real_readdir(struct file *filp, void *dirent, /* special case for "." */ if (filp->f_pos == 0) { - over = filldir(dirent, ".", 1, 1, btrfs_ino(inode), DT_DIR); + over = filldir(dirent, ".", 1, + filp->f_pos, btrfs_ino(inode), DT_DIR); if (over) return 0; filp->f_pos = 1; @@ -4134,7 +4135,7 @@ static int btrfs_real_readdir(struct file *filp, void *dirent, if (filp->f_pos == 1) { u64 pino = parent_ino(filp->f_path.dentry); over = filldir(dirent, "..", 2, - 2, pino, DT_DIR); + filp->f_pos, pino, DT_DIR); if (over) return 0; filp->f_pos = 2; |