cifs: move cifs_new_fileinfo to file.c

It's currently in dir.c which makes little sense...

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Suresh Jayaraman <sjayaraman@suse.de>
Acked-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>

diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 600eac18cb21242bffd599fe106fa0adb971c2f0..3840eddbfb7afd504e01862bcfbb2e6a1d975e0b 100644 (file)
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -130,54 +130,6 @@ cifs_bp_rename_retry:
        return full_path;
 }
 
-struct cifsFileInfo *
-cifs_new_fileinfo(__u16 fileHandle, struct file *file,
-                 struct tcon_link *tlink, __u32 oplock)
-{
-       struct dentry *dentry = file->f_path.dentry;
-       struct inode *inode = dentry->d_inode;
-       struct cifsInodeInfo *pCifsInode = CIFS_I(inode);
-       struct cifsFileInfo *pCifsFile;
-
-       pCifsFile = kzalloc(sizeof(struct cifsFileInfo), GFP_KERNEL);
-       if (pCifsFile == NULL)
-               return pCifsFile;
-
-       pCifsFile->netfid = fileHandle;
-       pCifsFile->pid = current->tgid;
-       pCifsFile->uid = current_fsuid();
-       pCifsFile->dentry = dget(dentry);
-       pCifsFile->f_flags = file->f_flags;
-       pCifsFile->invalidHandle = false;
-       pCifsFile->closePend = false;
-       pCifsFile->tlink = cifs_get_tlink(tlink);
-       mutex_init(&pCifsFile->fh_mutex);
-       mutex_init(&pCifsFile->lock_mutex);
-       INIT_LIST_HEAD(&pCifsFile->llist);
-       atomic_set(&pCifsFile->count, 1);
-       INIT_WORK(&pCifsFile->oplock_break, cifs_oplock_break);
-
-       write_lock(&GlobalSMBSeslock);
-       list_add(&pCifsFile->tlist, &(tlink_tcon(tlink)->openFileList));
-       /* if readable file instance put first in list*/
-       if (file->f_mode & FMODE_READ)
-               list_add(&pCifsFile->flist, &pCifsInode->openFileList);
-       else
-               list_add_tail(&pCifsFile->flist, &pCifsInode->openFileList);
-       write_unlock(&GlobalSMBSeslock);
-
-       if ((oplock & 0xF) == OPLOCK_EXCLUSIVE) {
-               pCifsInode->clientCanCacheAll = true;
-               pCifsInode->clientCanCacheRead = true;
-               cFYI(1, "Exclusive Oplock inode %p", inode);
-       } else if ((oplock & 0xF) == OPLOCK_READ)
-               pCifsInode->clientCanCacheRead = true;
-
-       file->private_data = pCifsFile;
-
-       return pCifsFile;
-}
-
 static void setup_cifs_dentry(struct cifsTconInfo *tcon,
                              struct dentry *direntry,
                              struct inode *newinode)

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 7935816fa1115d9ce4be3809c2289cf0b36dc311..293e9b76762179c98656f9e3ef18385c31e5d6e3 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -219,6 +219,53 @@ posix_open_ret:
        return rc;
 }
 
+struct cifsFileInfo *
+cifs_new_fileinfo(__u16 fileHandle, struct file *file,
+                 struct tcon_link *tlink, __u32 oplock)
+{
+       struct dentry *dentry = file->f_path.dentry;
+       struct inode *inode = dentry->d_inode;
+       struct cifsInodeInfo *pCifsInode = CIFS_I(inode);
+       struct cifsFileInfo *pCifsFile;
+
+       pCifsFile = kzalloc(sizeof(struct cifsFileInfo), GFP_KERNEL);
+       if (pCifsFile == NULL)
+               return pCifsFile;
+
+       pCifsFile->netfid = fileHandle;
+       pCifsFile->pid = current->tgid;
+       pCifsFile->uid = current_fsuid();
+       pCifsFile->dentry = dget(dentry);
+       pCifsFile->f_flags = file->f_flags;
+       pCifsFile->invalidHandle = false;
+       pCifsFile->closePend = false;
+       pCifsFile->tlink = cifs_get_tlink(tlink);
+       mutex_init(&pCifsFile->fh_mutex);
+       mutex_init(&pCifsFile->lock_mutex);
+       INIT_LIST_HEAD(&pCifsFile->llist);
+       atomic_set(&pCifsFile->count, 1);
+       INIT_WORK(&pCifsFile->oplock_break, cifs_oplock_break);
+
+       write_lock(&GlobalSMBSeslock);
+       list_add(&pCifsFile->tlist, &(tlink_tcon(tlink)->openFileList));
+       /* if readable file instance put first in list*/
+       if (file->f_mode & FMODE_READ)
+               list_add(&pCifsFile->flist, &pCifsInode->openFileList);
+       else
+               list_add_tail(&pCifsFile->flist, &pCifsInode->openFileList);
+       write_unlock(&GlobalSMBSeslock);
+
+       if ((oplock & 0xF) == OPLOCK_EXCLUSIVE) {
+               pCifsInode->clientCanCacheAll = true;
+               pCifsInode->clientCanCacheRead = true;
+               cFYI(1, "Exclusive Oplock inode %p", inode);
+       } else if ((oplock & 0xF) == OPLOCK_READ)
+               pCifsInode->clientCanCacheRead = true;
+
+       file->private_data = pCifsFile;
+       return pCifsFile;
+}
+
 int cifs_open(struct inode *inode, struct file *file)
 {
        int rc = -EACCES;