diff options
| author | Andy Green <andy.green@linaro.org> | 2012-10-24 02:18:16 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-10-24 02:18:16 +0800 |
| commit | 63509eaaf7046b56f93c1f05329014df092f2c03 (patch) | |
| tree | 120abc9be98d44ddc6435e5eb61fd07bd2d3923b /mm | |
| parent | b4fc4e0612ac9b2e6801117f0782b0ef7c8d6cce (diff) | |
| parent | 553f672df76c6213b9a7e644b1d878204a61e013 (diff) | |
Merge tag 'v3.4.15' into tilt-3.4
This is the 3.4.15 stable release
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/shmem.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 2910f0d58c46..70405852d0b1 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2018,12 +2018,14 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, { struct inode *inode; struct dentry *dentry = NULL; - u64 inum = fid->raw[2]; - inum = (inum << 32) | fid->raw[1]; + u64 inum; if (fh_len < 3) return NULL; + inum = fid->raw[2]; + inum = (inum << 32) | fid->raw[1]; + inode = ilookup5(sb, (unsigned long)(inum + fid->raw[0]), shmem_match, fid->raw); if (inode) { |