diff options
author | Tony Lindgren <tony@atomide.com> | 2010-02-11 02:18:13 (GMT) |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-02-11 02:18:13 (GMT) |
commit | 0482e3c6f704d25b6a4e3c940caeeacece4e6d74 (patch) | |
tree | a8506b9b15ed9a31c2171fc7b461ef52453307b0 /fs/affs/symlink.c | |
parent | 9ba874506b7b3883d78b8cad61eba39c4bb09885 (diff) | |
parent | a6c7fdd29350a74ba5f76809436de9c3d6763009 (diff) | |
download | linux-fsl-qoriq-0482e3c6f704d25b6a4e3c940caeeacece4e6d74.tar.xz |
Merge branch 'omap-fixes-for-linus' into omap-for-linus
Diffstat (limited to 'fs/affs/symlink.c')
-rw-r--r-- | fs/affs/symlink.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/affs/symlink.c b/fs/affs/symlink.c index 4178253..ee00f08 100644 --- a/fs/affs/symlink.c +++ b/fs/affs/symlink.c @@ -20,7 +20,6 @@ static int affs_symlink_readpage(struct file *file, struct page *page) int i, j; char c; char lc; - char *pf; pr_debug("AFFS: follow_link(ino=%lu)\n",inode->i_ino); @@ -32,11 +31,15 @@ static int affs_symlink_readpage(struct file *file, struct page *page) j = 0; lf = (struct slink_front *)bh->b_data; lc = 0; - pf = AFFS_SB(inode->i_sb)->s_prefix ? AFFS_SB(inode->i_sb)->s_prefix : "/"; if (strchr(lf->symname,':')) { /* Handle assign or volume name */ + struct affs_sb_info *sbi = AFFS_SB(inode->i_sb); + char *pf; + spin_lock(&sbi->symlink_lock); + pf = sbi->s_prefix ? sbi->s_prefix : "/"; while (i < 1023 && (c = pf[i])) link[i++] = c; + spin_unlock(&sbi->symlink_lock); while (i < 1023 && lf->symname[j] != ':') link[i++] = lf->symname[j++]; if (i < 1023) |