From: Andrew Deason <adeason@sinenomine.net>
Date: Fri, 19 Mar 2010 14:31:04 +0000 (-0500)
Subject: volume_inline.h does not need sys/file.h
X-Git-Tag: openafs-devel-1_5_73~41
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7595adc20b9ae1807cf720c72917eb6d133c765f;p=packages%2Fo%2Fopenafs.git

volume_inline.h does not need sys/file.h

src/vol/volume_inline.h does not need sys/file.h; at one point, it was
using macros from sys/file.h for locking constants, but now we use the
lwp/lock.h constants. So, include that instead. Also, only include it
for DAFS, since we only use the constants in the DAFS case. Thanks,
Jeffrey Altman.

Change-Id: I114b438d7fb1fbb3a35bdfa0717ac334c7f80355
Reviewed-on: http://gerrit.openafs.org/1596
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---

diff --git a/src/vol/volume_inline.h b/src/vol/volume_inline.h
index fb5a479c2..e63708e3d 100644
--- a/src/vol/volume_inline.h
+++ b/src/vol/volume_inline.h
@@ -7,14 +7,16 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <sys/file.h>
-
 #ifndef _AFS_VOL_VOLUME_INLINE_H
 #define _AFS_VOL_VOLUME_INLINE_H 1
 
 #include "volume.h"
 #include "partition.h"
 
+#ifdef AFS_DEMAND_ATTACH_FS
+# include "lock.h"
+#endif
+
 /**
  * tell caller whether the given program type represents a salvaging
  * program.