From patchwork Tue Jan 4 13:16:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 450661 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p04DGh4r026590 for ; Tue, 4 Jan 2011 13:16:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751249Ab1ADNQn (ORCPT ); Tue, 4 Jan 2011 08:16:43 -0500 Received: from mail-qy0-f174.google.com ([209.85.216.174]:51250 "EHLO mail-qy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751235Ab1ADNQm (ORCPT ); Tue, 4 Jan 2011 08:16:42 -0500 Received: by qyj19 with SMTP id 19so16989740qyj.19 for ; Tue, 04 Jan 2011 05:16:42 -0800 (PST) Received: by 10.224.67.84 with SMTP id q20mr20197284qai.246.1294147001920; Tue, 04 Jan 2011 05:16:41 -0800 (PST) Received: from salusa.poochiereds.net (cpe-071-070-153-003.nc.res.rr.com [71.70.153.3]) by mx.google.com with ESMTPS id l12sm12752149qcu.19.2011.01.04.05.16.40 (version=SSLv3 cipher=RC4-MD5); Tue, 04 Jan 2011 05:16:40 -0800 (PST) From: Jeff Layton To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org Subject: [PATCH] cifs: switch cifs_open and cifs_create to use CIFSSMBUnixSetFileInfo Date: Tue, 4 Jan 2011 08:16:36 -0500 Message-Id: <1294146996-25591-1-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.3.4 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 04 Jan 2011 13:16:44 +0000 (UTC) diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index 521d841..d9b46bf 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -293,10 +293,8 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, args.uid = NO_CHANGE_64; args.gid = NO_CHANGE_64; } - CIFSSMBUnixSetPathInfo(xid, tcon, full_path, &args, - cifs_sb->local_nls, - cifs_sb->mnt_cifs_flags & - CIFS_MOUNT_MAP_SPECIAL_CHR); + CIFSSMBUnixSetFileInfo(xid, tcon, &args, fileHandle, + current->tgid); } else { /* BB implement mode setting via Windows security descriptors e.g. */ diff --git a/fs/cifs/file.c b/fs/cifs/file.c index a7b8a37..4007e60 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -424,10 +424,8 @@ int cifs_open(struct inode *inode, struct file *file) .mtime = NO_CHANGE_64, .device = 0, }; - CIFSSMBUnixSetPathInfo(xid, tcon, full_path, &args, - cifs_sb->local_nls, - cifs_sb->mnt_cifs_flags & - CIFS_MOUNT_MAP_SPECIAL_CHR); + CIFSSMBUnixSetFileInfo(xid, tcon, &args, netfid, + pCifsFile->pid); } out: