Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[firefly-linux-kernel-4.4.55.git] / fs / xfs / xfs_inode.h

diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index c10e3fadd9af659f58d3a512e9706d93bcf123ff..9af2882e1f4c10fa8eed52512a341663e2ff33d4 100644 (file)
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -102,7 +102,7 @@ xfs_new_eof(struct xfs_inode *ip, xfs_fsize_t new_size)
 {
        xfs_fsize_t i_size = i_size_read(VFS_I(ip));
 
-       if (new_size > i_size)
+       if (new_size > i_size || new_size < 0)
                new_size = i_size;
        return new_size > ip->i_d.di_size ? new_size : 0;
 }