[linux] 03/03: linux-source: Fix build failure for non-modular configurations (Closes: #827561)

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch wheezy-security
in repository linux.

commit 0892ab26b55c14e87f20ee07641139784bdbe851
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Jun 17 23:41:37 2016 +0100

    linux-source: Fix build failure for non-modular configurations (Closes: #827561)
    
    Regression in 3.2.81-1 caused by fix for #627782.
---
 debian/changelog                                                   | 7 +++++++
 debian/patches/debian/fs-fix-abi-change-for-aufs-f_setfl-fix.patch | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2340d37..8820374 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux (3.2.81-2) UNRELEASED; urgency=medium
+
+  * linux-source: Fix build failure for non-modular configurations (Closes: #827561;
+    regression in 3.2.81-1)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Fri, 17 Jun 2016 23:35:41 +0100
+
 linux (3.2.81-1) wheezy-security; urgency=high
 
   * New upstream stable update:
diff --git a/debian/patches/debian/fs-fix-abi-change-for-aufs-f_setfl-fix.patch b/debian/patches/debian/fs-fix-abi-change-for-aufs-f_setfl-fix.patch
index 487ee4a..c35f7d9 100644
--- a/debian/patches/debian/fs-fix-abi-change-for-aufs-f_setfl-fix.patch
+++ b/debian/patches/debian/fs-fix-abi-change-for-aufs-f_setfl-fix.patch
@@ -19,7 +19,7 @@ version of the module that implements the file_operations.
 ---
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
-@@ -175,7 +175,16 @@ int setfl(int fd, struct file * filp, un
+@@ -175,8 +175,20 @@ int setfl(int fd, struct file * filp, un
  
  	if (filp->f_op && filp->f_op->check_flags)
  		error = filp->f_op->check_flags(arg);
@@ -31,12 +31,16 @@ version of the module that implements the file_operations.
 +	 * Since only aufs will implement it, check that the file ops
 +	 * are implemented by a version of aufs that does.  (Ugh.)
 +	 */
++#ifdef CONFIG_AUFS_FS_MODULE
 +	if (!error && filp->f_op->owner &&
 +	    !strcmp(filp->f_op->owner->name, "aufs") &&
 +	    strstr(filp->f_op->owner->version, "+setfl"))
  		error = filp->f_op->setfl(filp, arg);
++#endif
++
  	if (error)
  		return error;
+ 
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
 @@ -1621,13 +1621,16 @@ struct file_operations {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git