diff --git a/[refs] b/[refs] index 20e02c9d1c0f..95679480c8f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be857df1dd8d8e1491e60d999caf3b8446ccd475 +refs/heads/master: 97e133b4543c5c677e768a8538d6d704c4218ff2 diff --git a/trunk/fs/ext4/namei.c b/trunk/fs/ext4/namei.c index 9fd2a5e1be4d..4b8d431d7dff 100644 --- a/trunk/fs/ext4/namei.c +++ b/trunk/fs/ext4/namei.c @@ -74,10 +74,6 @@ static struct buffer_head *ext4_append(handle_t *handle, #define assert(test) J_ASSERT(test) #endif -#ifndef swap -#define swap(x, y) do { typeof(x) z = x; x = y; y = z; } while (0) -#endif - #ifdef DX_DEBUG #define dxtrace(command) command #else