diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-28 12:49:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-28 12:49:56 +0100 |
| commit | 9ee4be4156b1a507f199e750ba2c13ffb6ea9b42 (patch) | |
| tree | c92cb39ad1f0be559390c2a995d9aad2b0300b14 /fs/btrfs/backref.c | |
| parent | regulator: Convert virtual and userspace regulator consumer drivers to use mo... (diff) | |
| parent | regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_... (diff) | |
| download | linux-9ee4be4156b1a507f199e750ba2c13ffb6ea9b42.tar.xz linux-9ee4be4156b1a507f199e750ba2c13ffb6ea9b42.zip | |
Merge remote-tracking branch 'regulator/for-linus' into regulator-next
Diffstat (limited to 'fs/btrfs/backref.c')
| -rw-r--r-- | fs/btrfs/backref.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index 8855aad3929c..22c64fff1bd5 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c @@ -683,7 +683,7 @@ static int inode_to_path(u64 inum, struct btrfs_inode_ref *iref, return PTR_ERR(fspath); if (fspath > fspath_min) { - ipath->fspath->val[i] = (u64)fspath; + ipath->fspath->val[i] = (u64)(unsigned long)fspath; ++ipath->fspath->elem_cnt; ipath->fspath->bytes_left = fspath - fspath_min; } else { |