diff options
| author | Hugh Dickins <[email protected]> | 2013-08-04 11:30:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2013-08-04 11:40:17 -0700 |
| commit | 387aae6fdd737038e92d7bb40712bdf6dcb11945 (patch) | |
| tree | 7066b704e3ca7bdc714226aca98f0b5e278d3367 | |
| parent | 2f85399115ff2632a2d32dd76ef8b524374e69f3 (diff) | |
tmpfs: fix SEEK_DATA/SEEK_HOLE regression
Commit 46a1c2c7ae53 ("vfs: export lseek_execute() to modules") broke the
tmpfs SEEK_DATA/SEEK_HOLE implementation, because vfs_setpos() converts
the carefully prepared -ENXIO to -EINVAL. Other filesystems avoid it in
error cases: do the same in tmpfs.
Signed-off-by: Hugh Dickins <[email protected]>
Cc: Jie Liu <[email protected]>
Cc: Al Viro <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
| -rw-r--r-- | mm/shmem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index a87990cf9f94..8335dbd3fc35 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1798,7 +1798,8 @@ static loff_t shmem_file_llseek(struct file *file, loff_t offset, int whence) } } - offset = vfs_setpos(file, offset, MAX_LFS_FILESIZE); + if (offset >= 0) + offset = vfs_setpos(file, offset, MAX_LFS_FILESIZE); mutex_unlock(&inode->i_mutex); return offset; } |