summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-01-14 09:15:28 +1100
committerPaul Mackerras <paulus@samba.org>2006-01-14 09:15:28 +1100
commit25cd6aa0aa059b48cdcef2a00981b14fafd5161a (patch)
tree7f7469861c44889ed97f81afeda9a9d08afa0e50 /fs
parentb11fa580ac06b34944a2b46a44ebce2c284e1a76 (diff)
parent67daf5f11f06b9b15f8320de1d237ccc2e74fe43 (diff)
downloadlinux-3.10-25cd6aa0aa059b48cdcef2a00981b14fafd5161a.tar.gz
linux-3.10-25cd6aa0aa059b48cdcef2a00981b14fafd5161a.tar.bz2
linux-3.10-25cd6aa0aa059b48cdcef2a00981b14fafd5161a.zip
Merge ../linux-2.6
Diffstat (limited to 'fs')
-rw-r--r--fs/ufs/util.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ufs/util.h b/fs/ufs/util.h
index b2640076679..e45ad537987 100644
--- a/fs/ufs/util.h
+++ b/fs/ufs/util.h
@@ -255,8 +255,8 @@ extern void _ubh_memcpyubh_(struct ufs_sb_private_info *, struct ufs_buffer_head
((struct ufs_super_block_first *)((ubh)->bh[0]->b_data))
#define ubh_get_usb_second(ubh) \
- ((struct ufs_super_block_second *)(ubh)-> \
- bh[UFS_SECTOR_SIZE >> uspi->s_fshift]->b_data + (UFS_SECTOR_SIZE & ~uspi->s_fmask))
+ ((struct ufs_super_block_second *)((ubh)->\
+ bh[UFS_SECTOR_SIZE >> uspi->s_fshift]->b_data + (UFS_SECTOR_SIZE & ~uspi->s_fmask)))
#define ubh_get_usb_third(ubh) \
((struct ufs_super_block_third *)((ubh)-> \