diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:15:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:15:21 +0200 |
| commit | f9e8e07e074a880e110922759dcdb369fecdf07c (patch) | |
| tree | 61bc9a61e0a0546a81d699047d9e001c50b52d50 /fs/cifs/dir.c | |
| parent | e9886ca3a93d7d041d3de8e5acebe213da777d59 (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
| download | op-kernel-dev-f9e8e07e074a880e110922759dcdb369fecdf07c.zip op-kernel-dev-f9e8e07e074a880e110922759dcdb369fecdf07c.tar.gz | |
Merge branch 'linus' into sched-devel
Diffstat (limited to 'fs/cifs/dir.c')
| -rw-r--r-- | fs/cifs/dir.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index f0b5b5f..fb69c1f 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -260,7 +260,9 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, buf, inode->i_sb, xid, &fileHandle); if (newinode) { - newinode->i_mode = mode; + if (cifs_sb->mnt_cifs_flags & + CIFS_MOUNT_DYNPERM) + newinode->i_mode = mode; if ((oplock & CIFS_CREATE_ACTION) && (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID)) { |
