From c5e23bb8f89a3b788eea3dcaecec8ca9b7dbe7f8 Mon Sep 17 00:00:00 2001 From: Steve French Date: Tue, 26 Feb 2008 03:44:02 +0000 Subject: [PATCH] --- yaml --- r: 86705 b: refs/heads/master c: 0b442d2c28479332610c46e1a74e5638ab63a97d h: refs/heads/master i: 86703: 31fac0f94fe1868a0dbe3bf9c0b38c8672ed32be v: v3 --- [refs] | 2 +- trunk/fs/cifs/inode.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 160693e8392a..8638c48b28e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75f12983d9949fef67ecc133ef4727d93d42b25a +refs/heads/master: 0b442d2c28479332610c46e1a74e5638ab63a97d diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c index 8c23fb330ea9..24eb4d392155 100644 --- a/trunk/fs/cifs/inode.c +++ b/trunk/fs/cifs/inode.c @@ -790,7 +790,7 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry) } static void posix_fill_in_inode(struct inode *tmp_inode, - FILE_UNIX_BASIC_INFO *pData, int *pobject_type, int isNewInode) + FILE_UNIX_BASIC_INFO *pData, int isNewInode) { struct cifsInodeInfo *cifsInfo = CIFS_I(tmp_inode); loff_t local_size; @@ -873,7 +873,6 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode) cFYI(1, ("posix mkdir returned 0x%x", rc)); d_drop(direntry); } else { - int obj_type; if (pInfo->Type == cpu_to_le32(-1)) { /* no return info, go query for it */ kfree(pInfo); @@ -909,7 +908,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode) /* we already checked in POSIXCreate whether frame was long enough */ posix_fill_in_inode(direntry->d_inode, - pInfo, &obj_type, 1 /* NewInode */); + pInfo, 1 /* NewInode */); #ifdef CONFIG_CIFS_DEBUG2 cFYI(1, ("instantiated dentry %p %s to inode %p", direntry, direntry->d_name.name, newinode));