Commit 7f57356b authored by Steve French's avatar Steve French
Browse files

[CIFS] Remove cifs_sb argument from *build_path_from_dentry 



This argument was added in a recent patch, but is unnecessary, since
the superblock is easily obtained from the dentry.

Signed-off-by: default avatarDave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent a9d02ad4

fs/cifs/cifsproto.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ extern unsigned int _GetXid(void); 
extern void _FreeXid(unsigned int);

#define GetXid() (int)_GetXid(); cFYI(1,("CIFS VFS: in %s as Xid: %d with uid: %d",__FUNCTION__, xid,current->fsuid));

#define FreeXid(curr_xid) {_FreeXid(curr_xid); cFYI(1,("CIFS VFS: leaving %s (xid = %d) rc = %d",__FUNCTION__,curr_xid,(int)rc));}

extern char *build_path_from_dentry(struct dentry *, const struct cifs_sb_info *cifs_sb);

extern char *build_path_from_dentry(struct dentry *);

extern char *build_wildcard_path_from_dentry(struct dentry *direntry);

extern void renew_parental_timestamps(struct dentry *direntry);

extern int SendReceive(const unsigned int /* xid */ , struct cifsSesInfo *,

fs/cifs/dir.c

+6 −5
Original line number Diff line number Diff line
@@ -43,11 +43,12 @@ renew_parental_timestamps(struct dentry *direntry) 


/* Note: caller must free return buffer */

char *

build_path_from_dentry(struct dentry *direntry, const struct cifs_sb_info *cifs_sb)

build_path_from_dentry(struct dentry *direntry)

{

	struct dentry *temp;

	int namelen = 0;

	char *full_path;

	char dirsep = CIFS_DIR_SEP(CIFS_SB(direntry->d_sb));



	if(direntry == NULL)

		return NULL;  /* not much we can do if dentry is freed and
@@ -74,7 +75,7 @@ build_path_from_dentry(struct dentry *direntry, const struct cifs_sb_info *cifs_ 
		if (namelen < 0) {

			break;

		} else {

			full_path[namelen] = CIFS_DIR_SEP(cifs_sb);

			full_path[namelen] = dirsep;

			strncpy(full_path + namelen + 1, temp->d_name.name,

				temp->d_name.len);

			cFYI(0, (" name: %s ", full_path + namelen));
@@ -138,7 +139,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, 
	pTcon = cifs_sb->tcon;



	down(&direntry->d_sb->s_vfs_rename_sem);

	full_path = build_path_from_dentry(direntry, cifs_sb);

	full_path = build_path_from_dentry(direntry);

	up(&direntry->d_sb->s_vfs_rename_sem);

	if(full_path == NULL) {

		FreeXid(xid);
@@ -310,7 +311,7 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode, dev_t dev 
	pTcon = cifs_sb->tcon;



	down(&direntry->d_sb->s_vfs_rename_sem);

	full_path = build_path_from_dentry(direntry, cifs_sb);

	full_path = build_path_from_dentry(direntry);

	up(&direntry->d_sb->s_vfs_rename_sem);

	if(full_path == NULL)

		rc = -ENOMEM;
@@ -409,7 +410,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, struct name 
	/* can not grab the rename sem here since it would

	deadlock in the cases (beginning of sys_rename itself)

	in which we already have the sb rename sem */

	full_path = build_path_from_dentry(direntry, cifs_sb);

	full_path = build_path_from_dentry(direntry);

	if(full_path == NULL) {

		FreeXid(xid);

		return ERR_PTR(-ENOMEM);

fs/cifs/fcntl.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ int cifs_dir_notify(struct file * file, unsigned long arg) 
	pTcon = cifs_sb->tcon;



	down(&file->f_dentry->d_sb->s_vfs_rename_sem);

	full_path = build_path_from_dentry(file->f_dentry, cifs_sb);

	full_path = build_path_from_dentry(file->f_dentry);

	up(&file->f_dentry->d_sb->s_vfs_rename_sem);



	if(full_path == NULL) {

fs/cifs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ int cifs_open(struct inode *inode, struct file *file) 
	}



	down(&inode->i_sb->s_vfs_rename_sem);

	full_path = build_path_from_dentry(file->f_dentry, cifs_sb);

	full_path = build_path_from_dentry(file->f_dentry);

	up(&inode->i_sb->s_vfs_rename_sem);

	if (full_path == NULL) {

		FreeXid(xid);
@@ -366,7 +366,7 @@ static int cifs_reopen_file(struct inode *inode, struct file *file, 
   those that already have the rename sem can end up causing writepage

   to get called and if the server was down that means we end up here,

   and we can never tell if the caller already has the rename_sem */

	full_path = build_path_from_dentry(file->f_dentry, cifs_sb);

	full_path = build_path_from_dentry(file->f_dentry);

	if (full_path == NULL) {

		up(&pCifsFile->fh_sem);

		FreeXid(xid);

fs/cifs/inode.c

+7 −7
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry) 
	/* Unlink can be called from rename so we can not grab the sem here

	   since we deadlock otherwise */

/*	down(&direntry->d_sb->s_vfs_rename_sem);*/

	full_path = build_path_from_dentry(direntry, cifs_sb);

	full_path = build_path_from_dentry(direntry);

/*	up(&direntry->d_sb->s_vfs_rename_sem);*/

	if (full_path == NULL) {

		FreeXid(xid);
@@ -580,7 +580,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode) 
	pTcon = cifs_sb->tcon;



	down(&inode->i_sb->s_vfs_rename_sem);

	full_path = build_path_from_dentry(direntry, cifs_sb);

	full_path = build_path_from_dentry(direntry);

	up(&inode->i_sb->s_vfs_rename_sem);

	if (full_path == NULL) {

		FreeXid(xid);
@@ -654,7 +654,7 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry) 
	pTcon = cifs_sb->tcon;



	down(&inode->i_sb->s_vfs_rename_sem);

	full_path = build_path_from_dentry(direntry, cifs_sb);

	full_path = build_path_from_dentry(direntry);

	up(&inode->i_sb->s_vfs_rename_sem);

	if (full_path == NULL) {

		FreeXid(xid);
@@ -707,8 +707,8 @@ int cifs_rename(struct inode *source_inode, struct dentry *source_direntry, 


	/* we already  have the rename sem so we do not need to grab it again

	   here to protect the path integrity */

	fromName = build_path_from_dentry(source_direntry, cifs_sb_source);

	toName = build_path_from_dentry(target_direntry, cifs_sb_target);

	fromName = build_path_from_dentry(source_direntry);

	toName = build_path_from_dentry(target_direntry);

	if ((fromName == NULL) || (toName == NULL)) {

		rc = -ENOMEM;

		goto cifs_rename_exit;
@@ -824,7 +824,7 @@ int cifs_revalidate(struct dentry *direntry) 


	/* can not safely grab the rename sem here if rename calls revalidate

	   since that would deadlock */

	full_path = build_path_from_dentry(direntry, cifs_sb);

	full_path = build_path_from_dentry(direntry);

	if (full_path == NULL) {

		FreeXid(xid);

		return -ENOMEM;
@@ -973,7 +973,7 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs) 
	pTcon = cifs_sb->tcon;



	down(&direntry->d_sb->s_vfs_rename_sem);

	full_path = build_path_from_dentry(direntry, cifs_sb);

	full_path = build_path_from_dentry(direntry);

	up(&direntry->d_sb->s_vfs_rename_sem);

	if (full_path == NULL) {

		FreeXid(xid);