Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[safe/jmp/linux-2.6] / fs / ufs / ufs_fs.h

diff --git a/fs/ufs/ufs_fs.h b/fs/ufs/ufs_fs.h
index eb9c0f2..6943ec6 100644 (file)
--- a/fs/ufs/ufs_fs.h
+++ b/fs/ufs/ufs_fs.h
@@ -233,11 +233,16 @@ typedef __u16 __bitwise __fs16;
  */
 #define ufs_cbtocylno(bno) \
        ((bno) * uspi->s_nspf / uspi->s_spc)
-#define ufs_cbtorpos(bno) \
+#define ufs_cbtorpos(bno)                                    \
+       ((UFS_SB(sb)->s_flags & UFS_CG_SUN) ?                 \
+        (((((bno) * uspi->s_nspf % uspi->s_spc) %            \
+           uspi->s_nsect) *                                  \
+          uspi->s_nrpos) / uspi->s_nsect)                    \
+        :                                                    \
        ((((bno) * uspi->s_nspf % uspi->s_spc / uspi->s_nsect \
        * uspi->s_trackskew + (bno) * uspi->s_nspf % uspi->s_spc \
        % uspi->s_nsect * uspi->s_interleave) % uspi->s_nsect \
-       * uspi->s_nrpos) / uspi->s_npsect)
+         * uspi->s_nrpos) / uspi->s_npsect))
 
 /*
  * The following macros optimize certain frequently calculated