turn cifs_setattr into a multiplexor that calls the correct function
Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
parent
feb3e20cee
commit
0510eeb736
@ -1709,21 +1709,18 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs)
|
|||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
|
static int
|
||||||
|
cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs)
|
||||||
{
|
{
|
||||||
int xid;
|
int xid;
|
||||||
struct inode *inode = direntry->d_inode;
|
struct inode *inode = direntry->d_inode;
|
||||||
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
||||||
struct cifsTconInfo *pTcon = cifs_sb->tcon;
|
|
||||||
struct cifsInodeInfo *cifsInode = CIFS_I(inode);
|
struct cifsInodeInfo *cifsInode = CIFS_I(inode);
|
||||||
char *full_path = NULL;
|
char *full_path = NULL;
|
||||||
int rc = -EACCES;
|
int rc = -EACCES;
|
||||||
__u32 dosattr = 0;
|
__u32 dosattr = 0;
|
||||||
__u64 mode = NO_CHANGE_64;
|
__u64 mode = NO_CHANGE_64;
|
||||||
|
|
||||||
if (pTcon->unix_ext)
|
|
||||||
return cifs_setattr_unix(direntry, attrs);
|
|
||||||
|
|
||||||
xid = GetXid();
|
xid = GetXid();
|
||||||
|
|
||||||
cFYI(1, ("setattr on file %s attrs->iavalid 0x%x",
|
cFYI(1, ("setattr on file %s attrs->iavalid 0x%x",
|
||||||
@ -1850,6 +1847,21 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
|
|||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
cifs_setattr(struct dentry *direntry, struct iattr *attrs)
|
||||||
|
{
|
||||||
|
struct inode *inode = direntry->d_inode;
|
||||||
|
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
||||||
|
struct cifsTconInfo *pTcon = cifs_sb->tcon;
|
||||||
|
|
||||||
|
if (pTcon->unix_ext)
|
||||||
|
return cifs_setattr_unix(direntry, attrs);
|
||||||
|
|
||||||
|
return cifs_setattr_nounix(direntry, attrs);
|
||||||
|
|
||||||
|
/* BB: add cifs_setattr_legacy for really old servers */
|
||||||
|
}
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
void cifs_delete_inode(struct inode *inode)
|
void cifs_delete_inode(struct inode *inode)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user