[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: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 248ddebd67f4..cf90c9ad2c87 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -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 @@ cifs_bp_rename_retry:
                 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);