Re: [PATCH] CIFS: Use invalidate_inode_pages2 instead of invalidate_remote_inode

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



2011/2/22 Pavel Shilovsky <piastry@xxxxxxxxxxx>:
> We should invalidate a page even if it is locked now by someone, because
> we can leave an invalid data there and then think it's uptodate according
> to an oplock level (exclusive or II).
>
> Signed-off-by: Pavel Shilovsky <piastry@xxxxxxxxxxx>
> ---
>  fs/cifs/inode.c |   13 ++++++++-----
>  1 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
> index 8852470..1da1f26 100644
> --- a/fs/cifs/inode.c
> +++ b/fs/cifs/inode.c
> @@ -1691,12 +1691,15 @@ cifs_invalidate_mapping(struct inode *inode)
>
>        cifs_i->invalid_mapping = false;
>
> -       /* write back any cached data */
> -       if (inode->i_mapping && inode->i_mapping->nrpages != 0) {
> -               rc = filemap_write_and_wait(inode->i_mapping);
> -               mapping_set_error(inode->i_mapping, rc);
> +       if (inode->i_mapping) {
> +               /* write back any cached data */
> +               if (inode->i_mapping->nrpages != 0) {
> +                       rc = filemap_write_and_wait(inode->i_mapping);
> +                       mapping_set_error(inode->i_mapping, rc);
> +               }
> +               invalidate_inode_pages2(inode->i_mapping);
>        }
> -       invalidate_remote_inode(inode);
> +
>        cifs_fscache_reset_inode_cookie(inode);
>  }
>
> --
> 1.7.1
>
>

I attached python script-reproducer. All shares should be mount with
new strictcache mount option.

-- 
Best regards,
Pavel Shilovsky.
#!/usr/bin/env python
#
# We have to mount the same share to test, test1, test2 directories that locate in the directory we
# execute this script from.

from os import open, close, O_RDWR, O_CREAT, write, read, O_RDONLY, O_WRONLY, O_TRUNC, lseek, SEEK_END, SEEK_SET
import time

tries = 1

while True:
	print 'try #', tries
	f = open('test/_test4321_', O_RDWR | O_CREAT | O_TRUNC)
	close(f)

	f1 = open('test1/_test4321_', O_RDWR)
	write(f1, 'a')
	close(f1)

	f2 = open('test2/_test4321_', O_WRONLY)
	write(f2, 'x')
	close(f2)

	f3 = open('test1/_test4321_', O_RDONLY)
	res = read(f3, 1)
	print 'must be x:', res, '-',
	if res != 'x':
		print 'FAIL'
		time.sleep(1)
		exit()
	time.sleep(0.1)

	close(f3)
	print 'OK'
	tries += 1

[Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux