diff options
author | Jeff Layton <jlayton@redhat.com> | 2010-09-29 19:51:11 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2010-10-06 12:12:59 -0400 |
commit | 6508d904e6fb66ce4c34617f72b38d6714c4b9f6 (patch) | |
tree | a5d24f696c9a9045c3880671eeb5fbc6ca9f61ab /fs/cifs/inode.c | |
parent | 13cfb7334eb6fd0fc06da5589aea1e947791f1d6 (diff) |
cifs: have find_readable/writable_file filter by fsuid
When we implement multiuser mounts, we'll need to filter filehandles
by fsuid. Add a flag for multiuser mounts and code to filter by
fsuid when it's set.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/inode.c')
-rw-r--r-- | fs/cifs/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index a39a1c451733..df29a3a3d80c 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
@@ -963,7 +963,7 @@ cifs_set_file_info(struct inode *inode, struct iattr *attrs, int xid, | |||
963 | /* | 963 | /* |
964 | * If the file is already open for write, just use that fileid | 964 | * If the file is already open for write, just use that fileid |
965 | */ | 965 | */ |
966 | open_file = find_writable_file(cifsInode); | 966 | open_file = find_writable_file(cifsInode, true); |
967 | if (open_file) { | 967 | if (open_file) { |
968 | netfid = open_file->netfid; | 968 | netfid = open_file->netfid; |
969 | netpid = open_file->pid; | 969 | netpid = open_file->pid; |
@@ -1813,7 +1813,7 @@ cifs_set_file_size(struct inode *inode, struct iattr *attrs, | |||
1813 | * writebehind data than the SMB timeout for the SetPathInfo | 1813 | * writebehind data than the SMB timeout for the SetPathInfo |
1814 | * request would allow | 1814 | * request would allow |
1815 | */ | 1815 | */ |
1816 | open_file = find_writable_file(cifsInode); | 1816 | open_file = find_writable_file(cifsInode, true); |
1817 | if (open_file) { | 1817 | if (open_file) { |
1818 | __u16 nfid = open_file->netfid; | 1818 | __u16 nfid = open_file->netfid; |
1819 | __u32 npid = open_file->pid; | 1819 | __u32 npid = open_file->pid; |
@@ -1978,7 +1978,7 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs) | |||
1978 | args->ctime = NO_CHANGE_64; | 1978 | args->ctime = NO_CHANGE_64; |
1979 | 1979 | ||
1980 | args->device = 0; | 1980 | args->device = 0; |
1981 | open_file = find_writable_file(cifsInode); | 1981 | open_file = find_writable_file(cifsInode, true); |
1982 | if (open_file) { | 1982 | if (open_file) { |
1983 | u16 nfid = open_file->netfid; | 1983 | u16 nfid = open_file->netfid; |
1984 | u32 npid = open_file->pid; | 1984 | u32 npid = open_file->pid; |