From patchwork Mon Oct 11 19:07:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 246211 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 o9BJ7FUs003293 for ; Mon, 11 Oct 2010 19:07:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755869Ab0JKTHj (ORCPT ); Mon, 11 Oct 2010 15:07:39 -0400 Received: from cdptpa-omtalb.mail.rr.com ([75.180.132.121]:49730 "EHLO cdptpa-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755674Ab0JKTHi (ORCPT ); Mon, 11 Oct 2010 15:07:38 -0400 X-Authority-Analysis: v=1.1 cv=lu/RhtYP0ChAeUxMEPBris12a71TWT5f9yvo3GNwP9w= c=1 sm=0 a=oMkoTcXBVi8A:10 a=ld/erqUjW76FpBUqCqkKeA==:17 a=20KFwNOVAAAA:8 a=jpP6BN6fhzT7Nqo1A7kA:9 a=Re1zaTHkKi3zAVls6xwA:7 a=fQFBnu_SNVS1KAPRzkKLTv3uhssA:4 a=jEp0ucaQiEUA:10 a=ld/erqUjW76FpBUqCqkKeA==:117 X-Cloudmark-Score: 0 X-Originating-IP: 71.70.153.3 Received: from [71.70.153.3] ([71.70.153.3:37718] helo=mail.poochiereds.net) by cdptpa-oedge02.mail.rr.com (envelope-from ) (ecelerity 2.2.3.46 r()) with ESMTP id C8/B5-14228-77063BC4; Mon, 11 Oct 2010 19:07:35 +0000 Received: by mail.poochiereds.net (Postfix, from userid 4447) id 48A7F58191; Mon, 11 Oct 2010 15:07:34 -0400 (EDT) From: Jeff Layton To: linux-cifs@vger.kernel.org Subject: [PATCH 05/16] cifs: eliminate oflags option from cifs_new_fileinfo Date: Mon, 11 Oct 2010 15:07:22 -0400 Message-Id: <1286824053-12084-6-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1286824053-12084-1-git-send-email-jlayton@redhat.com> References: <1286824053-12084-1-git-send-email-jlayton@redhat.com> 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]); Mon, 11 Oct 2010 19:07:46 +0000 (UTC) diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index 4f7edba..781676e 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h @@ -107,8 +107,7 @@ extern struct timespec cnvrtDosUnixTm(__le16 le_date, __le16 le_time, extern struct cifsFileInfo *cifs_new_fileinfo(struct inode *newinode, __u16 fileHandle, struct file *file, - struct tcon_link *tlink, - unsigned int oflags, __u32 oplock); + struct tcon_link *tlink, __u32 oplock); extern int cifs_posix_open(char *full_path, struct inode **pinode, struct super_block *sb, int mode, unsigned int f_flags, diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index 8c1af71..c95e88f 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -132,7 +132,7 @@ cifs_bp_rename_retry: struct cifsFileInfo * cifs_new_fileinfo(struct inode *newinode, __u16 fileHandle, struct file *file, - struct tcon_link *tlink, unsigned int oflags, __u32 oplock) + struct tcon_link *tlink, __u32 oplock) { struct dentry *dentry = file->f_path.dentry; struct cifsFileInfo *pCifsFile; @@ -160,13 +160,7 @@ cifs_new_fileinfo(struct inode *newinode, __u16 fileHandle, struct file *file, list_add(&pCifsFile->tlist, &(tlink_tcon(tlink)->openFileList)); pCifsInode = CIFS_I(newinode); if (pCifsInode) { - /* if readable file instance put first in list*/ - if (oflags & FMODE_READ) - list_add(&pCifsFile->flist, &pCifsInode->openFileList); - else - list_add_tail(&pCifsFile->flist, - &pCifsInode->openFileList); - + list_add(&pCifsFile->flist, &pCifsInode->openFileList); if ((oplock & 0xF) == OPLOCK_EXCLUSIVE) { pCifsInode->clientCanCacheAll = true; pCifsInode->clientCanCacheRead = true; @@ -396,7 +390,7 @@ cifs_create_set_dentry: } pfile_info = cifs_new_fileinfo(newinode, fileHandle, filp, - tlink, oflags, oplock); + tlink, oplock); if (pfile_info == NULL) { fput(filp); CIFSSMBClose(xid, tcon, fileHandle); @@ -670,8 +664,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, } cfile = cifs_new_fileinfo(newInode, fileHandle, filp, - tlink, nd->intent.open.flags, - oplock); + tlink, oplock); if (cfile == NULL) { fput(filp); CIFSSMBClose(xid, pTcon, fileHandle); diff --git a/fs/cifs/file.c b/fs/cifs/file.c index b1ca6a4..66d977b 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -273,7 +273,7 @@ int cifs_open(struct inode *inode, struct file *file) cFYI(1, "posix open succeeded"); pCifsFile = cifs_new_fileinfo(inode, netfid, file, - tlink, oflags, oplock); + tlink, oplock); if (pCifsFile == NULL) { CIFSSMBClose(xid, tcon, netfid); rc = -ENOMEM; @@ -365,8 +365,7 @@ int cifs_open(struct inode *inode, struct file *file) if (rc != 0) goto out; - pCifsFile = cifs_new_fileinfo(inode, netfid, file, tlink, - file->f_flags, oplock); + pCifsFile = cifs_new_fileinfo(inode, netfid, file, tlink, oplock); if (pCifsFile == NULL) { rc = -ENOMEM; goto out; @@ -1193,8 +1192,7 @@ struct cifsFileInfo *find_readable_file(struct cifsInodeInfo *cifs_inode, } /* else might as well continue, and look for another, or simply have the caller reopen it again rather than trying to fix this handle */ - } else /* write only file */ - break; /* write only files are last so must be done */ + } } read_unlock(&GlobalSMBSeslock); return NULL;