Merge branch 'akpm' (patches from Andrew)

[firefly-linux-kernel-4.4.55.git] / fs / affs / file.c

diff --git a/fs/affs/file.c b/fs/affs/file.c
index dcf27951781cfadc90711c0aa41f83401b2eb03b..659c579c4588b2a5e844d0e82a0195494d70a073 100644 (file)
--- a/fs/affs/file.c
+++ b/fs/affs/file.c
@@ -914,7 +914,7 @@ affs_truncate(struct inode *inode)
        if (inode->i_size) {
                AFFS_I(inode)->i_blkcnt = last_blk + 1;
                AFFS_I(inode)->i_extcnt = ext + 1;
-               if (AFFS_SB(sb)->s_flags & SF_OFS) {
+               if (affs_test_opt(AFFS_SB(sb)->s_flags, SF_OFS)) {
                        struct buffer_head *bh = affs_bread_ino(inode, last_blk, 0);
                        u32 tmp;
                        if (IS_ERR(bh)) {