Commit fef59fd7 authored Feb 06, 2013 by Eric W. Biederman

cifs: Convert struct cifsFileInfo to use a kuid



Cc: Steve French <smfrench@gmail.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

parent 4a2c8cf5

fs/cifs/cifsglob.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -930,7 +930,7 @@ struct cifsFileInfo {
		struct list_head tlist; /* pointer to next fid owned by tcon */
		struct list_head flist; /* next fid (file instance) for this inode */
		struct cifs_fid_locks llist; / brlocks held by this fid */
		unsigned int uid; /* allows finding which FileInfo structure */
		kuid_t uid; /* allows finding which FileInfo structure */
		__u32 pid; /* process id who opened file */
		struct cifs_fid fid; /* file id from remote */
		/* BB add lock scope info here if needed */ ;

fs/cifs/file.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1649,7 +1649,7 @@ struct cifsFileInfo find_readable_file(struct cifsInodeInfo cifs_inode,
		are always at the end of the list but since the first entry might
		have a close pending, we go through the whole list */
		list_for_each_entry(open_file, &cifs_inode->openFileList, flist) {
		if (fsuid_only && open_file->uid != current_fsuid())
		if (fsuid_only && !uid_eq(open_file->uid, current_fsuid()))
		continue;
		if (OPEN_FMODE(open_file->f_flags) & FMODE_READ) {
		if (!open_file->invalidHandle) {
		@@ -1702,7 +1702,7 @@ struct cifsFileInfo find_writable_file(struct cifsInodeInfo cifs_inode,
		list_for_each_entry(open_file, &cifs_inode->openFileList, flist) {
		if (!any_available && open_file->pid != current->tgid)
		continue;
		if (fsuid_only && open_file->uid != current_fsuid())
		if (fsuid_only && !uid_eq(open_file->uid, current_fsuid()))
		continue;
		if (OPEN_FMODE(open_file->f_flags) & FMODE_WRITE) {
		if (!open_file->invalidHandle) {