diff --git a/[refs] b/[refs] index 4fb7f497970f..fd317552bf8f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac69e973ff0660e455f4ba1ddd4dcce4ae70ed1a +refs/heads/master: 0a489cb3b6a7b277030cdbc97c2c65905db94536 diff --git a/trunk/fs/open.c b/trunk/fs/open.c index c32c89d6d8db..8279c65d3bef 100644 --- a/trunk/fs/open.c +++ b/trunk/fs/open.c @@ -331,7 +331,9 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small) asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length) { - return do_sys_ftruncate(fd, length, 1); + long ret = do_sys_ftruncate(fd, length, 1); + prevent_tail_call(ret); + return ret; } /* LFS versions of truncate are only needed on 32 bit machines */ @@ -343,7 +345,9 @@ asmlinkage long sys_truncate64(const char __user * path, loff_t length) asmlinkage long sys_ftruncate64(unsigned int fd, loff_t length) { - return do_sys_ftruncate(fd, length, 0); + long ret = do_sys_ftruncate(fd, length, 0); + prevent_tail_call(ret); + return ret; } #endif