[PATCH] tmpfs: fix SEEK_DATA/SEEK_HOLE regression

From: Hugh Dickins
Date: Sun Aug 04 2013 - 14:31:13 EST


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 <hughd@xxxxxxxxxx>
---

mm/shmem.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

--- 3.11-rc3/mm/shmem.c 2013-07-14 17:10:16.648003652 -0700
+++ linux/mm/shmem.c 2013-08-04 10:49:52.208372436 -0700
@@ -1798,7 +1798,8 @@ static loff_t shmem_file_llseek(struct f
}
}

- 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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/