diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 09:02:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 09:02:13 -0800 |
| commit | 2608e3d0fa63b892f37a9f1921c2d2b37c7933c1 (patch) | |
| tree | aca8b61fd63390edf5ddfe17b8ae35dfd56ed74d /fs/9p/vfs_inode.c | |
| parent | 33673dcb372b5d8179c22127ca71deb5f3dc7016 (diff) | |
| parent | b6f4bee02f682d1c86ece297871b78ae01afaaf4 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
Pull v9fs updates from Eric Van Hensbergen:
"Just fixes and simplifications"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
fs/9p: Fix atomic_open
fs/9p: Don't use O_TRUNC flag in TOPEN and TLOPEN request
locking in fs/9p ->readdir()
Diffstat (limited to 'fs/9p/vfs_inode.c')
| -rw-r--r-- | fs/9p/vfs_inode.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index 890bed538f9..57d017ac68e 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c @@ -192,9 +192,6 @@ int v9fs_uflags2omode(int uflags, int extended) break; } - if (uflags & O_TRUNC) - ret |= P9_OTRUNC; - if (extended) { if (uflags & O_EXCL) ret |= P9_OEXCL; |