Attachment 156476 Details for Bug 238597 – patch -- delta from upstream tarball

[patch] patch -- delta from upstream tarball

linux-2.6.18-cifs-1.48aRH-delta-from-tarball.patch (text/plain), 2.06 KB, created by Jeff Layton on 2007-06-07 16:14:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2007-06-07 16:14:17 UTC

Size: 2.06 KB

patch

obsolete

>diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c
>index 6c1833b..2e75883 100644
>--- a/fs/cifs/asn1.c
>+++ b/fs/cifs/asn1.c
>@@ -26,9 +26,6 @@
> #include "cifsglob.h"
> #include "cifs_debug.h"
> #include "cifsproto.h"
>-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
>-#include <linux/config.h>
>-#endif
> 
> /*****************************************************************************
>  *
>diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
>index 6da3439..153e118 100644
>--- a/fs/cifs/cifsfs.c
>+++ b/fs/cifs/cifsfs.c
>@@ -293,9 +293,6 @@ cifs_alloc_inode(struct super_block *sb)
> 	file data or metadata */
> 	cifs_inode->clientCanCacheRead = FALSE;
> 	cifs_inode->clientCanCacheAll = FALSE;
>-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
>-	cifs_inode->vfs_inode.i_blksize = CIFS_MAX_MSGSIZE;
>-#endif
> 	cifs_inode->vfs_inode.i_blkbits = 14;  /* 2**14 = CIFS_MAX_MSGSIZE */
> 	
> 	/* Can not set i_flags here - they get immediately overwritten
>diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
>index 233aa48..75ade9b 100644
>--- a/fs/cifs/cifsfs.h
>+++ b/fs/cifs/cifsfs.h
>@@ -148,5 +148,5 @@ extern ssize_t	cifs_getxattr(struct dentry *, const char *, void *, size_t);
> extern ssize_t	cifs_listxattr(struct dentry *, char *, size_t);
> extern int cifs_ioctl (struct inode * inode, struct file * filep,
> 		       unsigned int command, unsigned long arg);
>-#define CIFS_VERSION   "1.47"
>+#define CIFS_VERSION   "1.48aRH"
> #endif				/* _CIFSFS_H */
>diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
>index 2bbc2e1..9009d59 100644
>--- a/fs/cifs/connect.c
>+++ b/fs/cifs/connect.c
>@@ -1721,12 +1721,13 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
> 		return -EINVAL;
> 	}
> 
>-	if (volume_info.username) {
>+	if (volume_info.nullauth) {
>+		cFYI(1,("null user"));
>+		volume_info.username = NULL;
>+	} else if (volume_info.username) {
> 		/* BB fixme parse for domain name here */
> 		cFYI(1, ("Username: %s ", volume_info.username));
> 
>-	} else if (volume_info.nullauth) {
>-		cFYI(1,("null user"));
> 	} else {
> 		cifserror("No username specified");
>         /* In userspace mount helper we can get user name from alternate

Actions: View | Diff

Attachments on bug 238597: 153882 | 154279 | 156476 | 156478