On Mon, 2011-12-12 at 15:28 -0800, Andrew Morton wrote: > On Tue, 13 Dec 2011 00:06:36 +0100 > roel <[email protected]> wrote: > > > The test not SEEK_CUR or not SEEK_SET always evaluates to true > > > > Signed-off-by: Roel Kluin <[email protected]> > > --- > > fs/ceph/file.c | 2 +- > > fs/cifs/cifsfs.c | 2 +- > > fs/fuse/file.c | 2 +- > > fs/nfs/file.c | 2 +- > > 4 files changed, 4 insertions(+), 4 deletions(-) > > <snip> > > diff --git a/fs/nfs/file.c b/fs/nfs/file.c > > index eca56d4..606ef0f 100644 > > --- a/fs/nfs/file.c > > +++ b/fs/nfs/file.c > > @@ -147,7 +147,7 @@ static loff_t nfs_file_llseek(struct file *filp, loff_t > > offset, int origin) > > * origin == SEEK_END || SEEK_DATA || SEEK_HOLE => we must revalidate > > * the cached file length > > */ > > - if (origin != SEEK_SET || origin != SEEK_CUR) { > > + if (origin != SEEK_SET && origin != SEEK_CUR) { > > struct inode *inode = filp->f_mapping->host; > > > > int retval = nfs_revalidate_file_size(inode, filp); > > This fix will cause changed runtime behaviour, such as NFS no longer > running nfs_revalidate_file_size() for all seek modes.
As far as NFS is concerned, it reverts a regression. NFS only used to run revalidate_file_size() for SEEK_END prior to commit 06222e491e663dac939f04b125c9dc52126a75c4. I accept that we now also need to run it for SEEK_HOLE and SEEK_DATA, but we've never had to do so for SEEK_SET and SEEK_CUR. I suspect the same is true of ceph, cifs etc... Cheers Trond -- Trond Myklebust Linux NFS client maintainer NetApp [email protected] www.netapp.com -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
