debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Update aufs3-remove-circular-includes.patch 

Resolve the issues raised by bwh.

svn path=/dists/sid/linux/; revision=21582
This commit is contained in:
Ian Campbell 2014-07-20 07:30:17 +00:00
parent 5ea52e0a97
commit 06bdf13ff7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/patches/features/all/aufs3/aufs3-remove-circular-includes.patch vendored
View File

@ -76,9 +76,9 @@ Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
- file_update_time(pr);
-}
+#define vmr_fput(region) do { \
+ struct vm_region *_region = region; \
+ struct vm_region *_region = (region); \
+ struct file *f = _region->vm_file, *pr = _region->vm_prfile; \
+ aufs_trace(f, pr, __func__, __LINE__, vmr_fput); \
+ aufs_trace(f, pr, __func__, __LINE__, "vmr_fput"); \
+ fput(f); \
+ if (f && pr) \
+ fput(pr); \
@ -87,7 +87,7 @@ Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
+#endif
+
+#define vma_file_update_time(vma) { \
+ struct vm_area_struct *_vma = vma; \
+ struct vm_area_struct *_vma = (vma); \
+ struct file *f = _vma->vm_file, *pr = _vma->vm_prfile; \
+ aufs_trace(f, pr, __func__, __LINE__, \
+ "vma_file_update_time"); \
@ -134,7 +134,7 @@ Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
-#define vma_get_file(vma) vma_do_get_file(vma, __func__, __LINE__)
-#define vma_fput(vma) vma_do_fput(vma, __func__, __LINE__)
+#define vma_get_file(vma) do { \
+ struct vm_area_struct *_vma = vma; \
+ struct vm_area_struct *_vma = (vma); \
+ struct file *f = _vma->vm_file, *pr = _vma->vm_prfile; \
+ aufs_trace(f, pr, __func__, __LINE__, "vma_get_file"); \
+ get_file(f); \
@ -143,7 +143,7 @@ Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
+} while(0)
+
+#define vma_fput(vma) do { \
+ struct vm_area_struct *_vma = vma; \
+ struct vm_area_struct *_vma = (vma); \
+ struct file *f = _vma->vm_file, *pr = _vma->vm_prfile; \
+ aufs_trace(f, pr, __func__, __LINE__, "vma_fput"); \
+ fput(f); \