diff --git a/[refs] b/[refs] index 31de7dfe319e..a3d635dfceaf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45bc21edb52fa71dbb1324c6f573aa880e95519d +refs/heads/master: fc0f296126433e61600539325975b6c30681c07e diff --git a/trunk/fs/9p/vfs_file.c b/trunk/fs/9p/vfs_file.c index 36122683fae8..019f1cd8750b 100644 --- a/trunk/fs/9p/vfs_file.c +++ b/trunk/fs/9p/vfs_file.c @@ -215,7 +215,7 @@ v9fs_file_write(struct file *filp, const char __user * data, struct p9_fid *fid; struct p9_client *clnt; struct inode *inode = filp->f_path.dentry->d_inode; - int origin = *offset; + loff_t origin = *offset; unsigned long pg_start, pg_end; P9_DPRINTK(P9_DEBUG_VFS, "data %p count %d offset %x\n", data,