diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-10-28 19:33:36 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-10-28 19:36:46 -0400 |
| commit | c698dbf9fecae54e5dc159cee76939228c533a25 (patch) | |
| tree | 1b0231679ec4d86e6f88b233de825bd5b8e687ac /fs/nfs/dir.c | |
| parent | a3f432bfd06a4ec3b812e32d3266e0d1ad75d008 (diff) | |
| parent | f1fe29b4a02d0805aa7d0ff6b73410a9f9316d69 (diff) | |
| download | linux-stable-c698dbf9fecae54e5dc159cee76939228c533a25.tar.gz linux-stable-c698dbf9fecae54e5dc159cee76939228c533a25.tar.bz2 linux-stable-c698dbf9fecae54e5dc159cee76939228c533a25.zip | |
Merge branch 'fscache' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into linux-next
Pull fs-cache fixes from David Howells:
Can you pull these commits to fix an issue with NFS whereby caching can be
enabled on a file that is open for writing by subsequently opening it for
reading. This can be made to crash by opening it for writing again if you're
quick enough.
The gist of the patchset is that the cookie should be acquired at inode
creation only and subsequently enabled and disabled as appropriate (which
dispenses with the backing objects when they're not needed).
The extra synchronisation that NFS does can then be dispensed with as it is
thenceforth managed by FS-Cache.
Could you send these on to Linus?
This likely will need fixing also in CIFS and 9P also once the FS-Cache
changes are upstream. AFS and Ceph are probably safe.
* 'fscache' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
NFS: Use i_writecount to control whether to get an fscache cookie in nfs_open()
FS-Cache: Provide the ability to enable/disable cookies
FS-Cache: Add use/unuse/wake cookie wrappers
Diffstat (limited to 'fs/nfs/dir.c')
| -rw-r--r-- | fs/nfs/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 6cc51ae0638d..9a8676f33350 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -1387,7 +1387,7 @@ static struct nfs_open_context *create_nfs_open_context(struct dentry *dentry, i static int do_open(struct inode *inode, struct file *filp) { - nfs_fscache_set_inode_cookie(inode, filp); + nfs_fscache_open_file(inode, filp); return 0; } |