Changeset 2839 for box/trunk/bin

Timestamp:

09/01/2011 11:59:10 (17 months ago)

Author:

chris

Message:

Workaround for apparent btrfs bug, where symlinks appear to be on a
different filesystem than their containing directory, by only checking
for a different filesystem when checking directories, because files and
special files can't be mount points anyway. Thanks to Toke
Hoiland-Jorgensen.

File:

• box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp (modified) (2 diffs)

box/trunk/bin/bbackupd/BackupClientDirectoryRecord.cpp

@@ -326 +326 @@
                                         file_st.st_ino);
 
-                                if(file_st.st_dev != dest_st.st_dev)
+                                int type = file_st.st_mode & S_IFMT;
+
+                                /* Workaround for apparent btrfs bug, where
+                                symlinks appear to be on a different filesystem
+                                than their containing directory, thanks to
+                                Toke Hoiland-Jorgensen */
+                                if(type == S_IFDIR &&
+                                        file_st.st_dev != dest_st.st_dev)
                                 {
                                         if(!(rParams.mrContext.ExcludeDir(
@@ -336 +343 @@
                                         continue;
                                 }
-
-                                int type = file_st.st_mode & S_IFMT;
                                 #endif