diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-06-25 21:17:17 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-20 01:43:56 -0400 |
commit | dd7dd556e45133ef13f2c4bddc0e0b1ac23bc0e4 (patch) | |
tree | 4884b6af570a2a0cb01d11f39a38a3a9c73e49ba /fs/9p | |
parent | bf6c7f6c7bd0ea779757d35b5fdc9f9157f056b3 (diff) |
no need to check for LOOKUP_OPEN in ->create() instances
... it will be set in nd->flag for all cases with non-NULL nd
(i.e. when called from do_last()).
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/9p')
-rw-r--r-- | fs/9p/vfs_inode.c | 4 | ||||
-rw-r--r-- | fs/9p/vfs_inode_dotl.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index 47f71eb66b32..7f9976a866e9 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c | |||
@@ -633,7 +633,7 @@ v9fs_vfs_create(struct inode *dir, struct dentry *dentry, int mode, | |||
633 | fid = NULL; | 633 | fid = NULL; |
634 | v9ses = v9fs_inode2v9ses(dir); | 634 | v9ses = v9fs_inode2v9ses(dir); |
635 | perm = unixmode2p9mode(v9ses, mode); | 635 | perm = unixmode2p9mode(v9ses, mode); |
636 | if (nd && nd->flags & LOOKUP_OPEN) | 636 | if (nd) |
637 | flags = nd->intent.open.flags; | 637 | flags = nd->intent.open.flags; |
638 | else | 638 | else |
639 | flags = O_RDWR; | 639 | flags = O_RDWR; |
@@ -649,7 +649,7 @@ v9fs_vfs_create(struct inode *dir, struct dentry *dentry, int mode, | |||
649 | 649 | ||
650 | v9fs_invalidate_inode_attr(dir); | 650 | v9fs_invalidate_inode_attr(dir); |
651 | /* if we are opening a file, assign the open fid to the file */ | 651 | /* if we are opening a file, assign the open fid to the file */ |
652 | if (nd && nd->flags & LOOKUP_OPEN) { | 652 | if (nd) { |
653 | v9inode = V9FS_I(dentry->d_inode); | 653 | v9inode = V9FS_I(dentry->d_inode); |
654 | mutex_lock(&v9inode->v_mutex); | 654 | mutex_lock(&v9inode->v_mutex); |
655 | if (v9ses->cache && !v9inode->writeback_fid && | 655 | if (v9ses->cache && !v9inode->writeback_fid && |
diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c index d148e69f21b5..32bbbe5aa689 100644 --- a/fs/9p/vfs_inode_dotl.c +++ b/fs/9p/vfs_inode_dotl.c | |||
@@ -173,7 +173,7 @@ v9fs_vfs_create_dotl(struct inode *dir, struct dentry *dentry, int omode, | |||
173 | struct posix_acl *pacl = NULL, *dacl = NULL; | 173 | struct posix_acl *pacl = NULL, *dacl = NULL; |
174 | 174 | ||
175 | v9ses = v9fs_inode2v9ses(dir); | 175 | v9ses = v9fs_inode2v9ses(dir); |
176 | if (nd && nd->flags & LOOKUP_OPEN) | 176 | if (nd) |
177 | flags = nd->intent.open.flags; | 177 | flags = nd->intent.open.flags; |
178 | else { | 178 | else { |
179 | /* | 179 | /* |