diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-31 22:22:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-31 22:22:27 +0000 |
| commit | 825423e4c4f18289df2393951cfd2a7a31fc0464 (patch) | |
| tree | 4ad80e981c3d9effa910d2247d118d254f9a5d09 /fs/ncpfs | |
| parent | c4693dc4856ab907a5c02187a8d398861bebfc7e (diff) | |
Merge with Linux 2.4.1.
Diffstat (limited to 'fs/ncpfs')
| -rw-r--r-- | fs/ncpfs/dir.c | 6 | ||||
| -rw-r--r-- | fs/ncpfs/sock.c | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c index a187b1199..c16d93614 100644 --- a/fs/ncpfs/dir.c +++ b/fs/ncpfs/dir.c @@ -871,6 +871,12 @@ int ncp_create_new(struct inode *dir, struct dentry *dentry, int mode, goto out; error = -EACCES; + + if (S_ISREG(mode) && + (server->m.flags & NCP_MOUNT_EXTRAS) && + (mode & S_IXUGO)) + attributes |= aSYSTEM; + result = ncp_open_create_file_or_subdir(server, dir, __name, OC_MODE_CREATE | OC_MODE_OPEN | OC_MODE_REPLACE, attributes, AR_READ | AR_WRITE, &finfo); diff --git a/fs/ncpfs/sock.c b/fs/ncpfs/sock.c index 171f0cb51..470ea5e96 100644 --- a/fs/ncpfs/sock.c +++ b/fs/ncpfs/sock.c @@ -456,7 +456,10 @@ static int ncp_do_request(struct ncp_server *server, int size, spin_lock_irqsave(¤t->sigmask_lock, flags); old_set = current->blocked; - mask = sigmask(SIGKILL) | sigmask(SIGSTOP); + if (current->flags & PF_EXITING) + mask = 0; + else + mask = sigmask(SIGKILL); if (server->m.flags & NCP_MOUNT_INTR) { /* FIXME: This doesn't seem right at all. So, like, we can't handle SIGINT and get whatever to stop? |