diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-10 12:57:26 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-10 12:57:26 -0700 |
commit | e6a4b6f5eaa8478b7a0b9a17e40c51463631db1a (patch) | |
tree | 35e164226b3a590481469a1739a2eb2a7b1217c1 /fs/namei.c | |
parent | 2b64c5434d1303646388e748b7add69624a1cfee (diff) | |
parent | bd2a31d522344b3ac2fb680bd2366e77a9bd8209 (diff) | |
download | op-kernel-dev-e6a4b6f5eaa8478b7a0b9a17e40c51463631db1a.zip op-kernel-dev-e6a4b6f5eaa8478b7a0b9a17e40c51463631db1a.tar.gz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro.
Clean up file table accesses (get rid of fget_light() in favor of the
fdget() interface), add proper file position locking.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
get rid of fget_light()
sockfd_lookup_light(): switch to fdget^W^Waway from fget_light
vfs: atomic f_pos accesses as per POSIX
ocfs2 syncs the wrong range...
Diffstat (limited to 'fs/namei.c')
-rw-r--r-- | fs/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1884,7 +1884,7 @@ static int path_init(int dfd, const char *name, unsigned int flags, nd->path = f.file->f_path; if (flags & LOOKUP_RCU) { - if (f.need_put) + if (f.flags & FDPUT_FPUT) *fp = f.file; nd->seq = __read_seqcount_begin(&nd->path.dentry->d_seq); rcu_read_lock(); |