[Linux-cluster] [PATCH] Fix gnbd-kernel build with 2.6.12rc2

[Benjamin Marzinski]

On Thu, Apr 14, 2005 at 04:45:19PM +0200, Fabio Massimo Di Nitto wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Hi everybody,
> 
> the following patch fixes compilation of gnbd.c with 2.6.12rc2.
> 
> The i_sock has been recently removed from the inode structure (change
> happened in the kernel tree the 1st of April) and made part of i_mode.
> 
> Please apply.

Thanks,

I'll get it in shortly.

-Ben
 
> Signed-off-by: Fabio Massimo Di Nitto <fabbione at ubuntu.com>
> 
> Index: gnbd-kernel/src/gnbd.c
> ===================================================================
> RCS file: /cvs/cluster/cluster/gnbd-kernel/src/gnbd.c,v
> retrieving revision 1.7
> diff -u -r1.7 gnbd.c
> - --- gnbd-kernel/src/gnbd.c	7 Apr 2005 16:19:37 -0000	1.7
> +++ gnbd-kernel/src/gnbd.c	14 Apr 2005 14:30:29 -0000
> @@ -735,7 +735,7 @@
>  		if (!file)
>  			return error;
>  		inode = file->f_dentry->d_inode;
> - -		if (!inode->i_sock) {
> +		if (!S_ISSOCK(inode->i_mode)) {
>  			fput(file);
>  			return error;
>  		}
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.2.5 (GNU/Linux)
> 
> iQIVAwUBQl6BTVA6oBJjVJ+OAQIU7BAAnea52QS9ISXWHXWrrqeEaqFVbm1bSs1A
> +BKMycDiSsDKwttb+/bma2V56gjdqnv7//11wv2IiG5lt1q1HebgVTM+ecPMCRBb
> 6VsJV2NB+HgjRtcNkbAiw7hLVpcG+WFe5VaFVSsG20B5I47n9ahkF0a8umY4zSbd
> O1pCBJA3H4QMiTwlNA8kEj5EBdc3/jB4KCYGwGNhR7m61etZ4JMiEdGlOeQwYMK1
> 4DcXpCgo8aBLACUHGST2e3mnq48ztHHMNI7M0H8BLNrUbhm1EtIEtzyXqJjrS7ku
> TNZKKyfjlioAJk4B718ValMMEifZtlxwjlT3FEYfEd7/MUA2sw6ET4arFbDKcGjU
> Bn5wdFdoVDZpDwhWICfQq2rVleBydNGCyZ4HYMcI3WBi3RKH21zrLnt5YqL9EA/9
> 9TC8PhD24i8+9rp/kmRV3QtWJtooEO2VSfGKJSDXHoeKkt8S2RTByxuBo5UpBMkI
> z/+lB8zlDyF+qvn3TtkaTuJC8fk3clrkQfT+jiI4/7ZztK37NgcCF9Qe1rac3QS4
> VFRTrYJD8hcAOMa40HHCdZTyezetE4N/m6SDOJ+Pps+2KTWYxkJguas0+Aua5yeP
> jyyAV3vmKMmPewbNknw1gHoPTI4pz1QUZ89E3hhnmM1Zoi6y4CMzq1ndv/ZqAROx
> cS4j9lsnd60=
> =+YaG
> -----END PGP SIGNATURE-----
> 
> --
> Linux-cluster mailing list
> Linux-cluster at redhat.com
> http://www.redhat.com/mailman/listinfo/linux-cluster