Attachment 157313 Details for Bug 239339 – patch -- tweaks made to tarball to create RHEL4 patch

[patch] patch -- tweaks made to tarball to create RHEL4 patch

cifs-1.48aRH-tweaks.patch (text/plain), 2.99 KB, created by Jeff Layton on 2007-06-18 18:57:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2007-06-18 18:57:26 UTC

Size: 2.99 KB

patch

obsolete

>commit cf78d240305f3b6b5a2e4dd829971e26b1d24247
>Author: Jeff Layton <jlayton@redhat.com>
>Date:   Mon Jun 18 14:44:47 2007 -0400
>
>    Various tweaks to make 1.48a build against RHEL4's kernel
>    Include fix to allow sec=none to force an anonymous mount
>
>diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
>index 6da3439..56aff02 100644
>--- a/fs/cifs/cifsfs.c
>+++ b/fs/cifs/cifsfs.c
>@@ -182,17 +182,6 @@ cifs_put_super(struct super_block *sb)
> 	return;
> }
> 
>-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 16)
>-void * kzalloc(size_t size, unsigned flgs)
>-{
>-	void * buf;
>-	buf = kmalloc(size, flgs);
>-	if(buf != NULL)
>-		memset(buf, 0, size);
>-	return buf;
>-}
>-#endif
>-
> #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)
> static int
> cifs_statfs(struct dentry *dentry, struct kstatfs *buf)
>diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
>index 233aa48..7933187 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.48a.RH"
> #endif				/* _CIFSFS_H */
>diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
>index ae79d24..a71c03f 100644
>--- a/fs/cifs/cifsproto.h
>+++ b/fs/cifs/cifsproto.h
>@@ -365,7 +365,4 @@ extern int CIFSSMBSetPosixACL(const int xid, struct cifsTconInfo *tcon,
> 		const struct nls_table *nls_codepage, int remap_special_chars);
> extern int CIFSGetExtAttr(const int xid, struct cifsTconInfo *tcon,
>                 const int netfid, __u64 * pExtAttrBits, __u64 *pMask);
>-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 16)
>-extern void * kzalloc(size_t size, unsigned flgs);
>-#endif
> #endif			/* _CIFSPROTO_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
>diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
>index 6fe80c6..df0e3fd 100644
>--- a/fs/cifs/inode.c
>+++ b/fs/cifs/inode.c
>@@ -1178,7 +1178,11 @@ static int cifs_vmtruncate(struct inode * inode, loff_t offset)
> 	goto out_truncate;
> 
> do_expand:
>+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 9, 0)
> 	limit = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
>+#else
>+	limit = current->rlim[RLIMIT_FSIZE].rlim_cur;
>+#endif
> 	if (limit != RLIM_INFINITY && offset > limit) {
> 		spin_unlock(&inode->i_lock);
> 		goto out_sig;

Actions: View | Diff

Attachments on bug 239339: 157310 | 157311 | 157313 | 158846 | 158848 | 158849